summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
Diffstat (limited to 'src/input')
-rw-r--r--src/input/input_net.c1
-rw-r--r--src/input/strict_scr.c12
-rw-r--r--src/input/strict_scr.h2
3 files changed, 7 insertions, 8 deletions
diff --git a/src/input/input_net.c b/src/input/input_net.c
index 6b859ea6e..c89c25524 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -99,7 +99,6 @@ static int host_connect_attempt(struct in_addr ia, int port, xine_t *xine) {
int s;
struct sockaddr_in sin;
- fd_set wfd;
s = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
if (s==-1) {
diff --git a/src/input/strict_scr.c b/src/input/strict_scr.c
index ba045418e..a0c78f1f3 100644
--- a/src/input/strict_scr.c
+++ b/src/input/strict_scr.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: strict_scr.c,v 1.1 2002/01/10 21:42:50 guenter Exp $
+ * $Id: strict_scr.c,v 1.2 2002/02/09 07:13:23 guenter Exp $
*
* scr plugin that may not allow others to adjust it (used for streaming)
*/
@@ -70,7 +70,7 @@ static int strictscr_set_speed (scr_plugin_t *scr, int speed) {
return speed;
}
-static void strictscr_adjust (scr_plugin_t *scr, uint32_t vpts) {
+static void strictscr_adjust (scr_plugin_t *scr, int64_t vpts) {
strictscr_t *this = (strictscr_t*) scr;
struct timeval tv;
@@ -88,7 +88,7 @@ static void strictscr_adjust (scr_plugin_t *scr, uint32_t vpts) {
}
}
-static void strictscr_start (scr_plugin_t *scr, uint32_t start_vpts) {
+static void strictscr_start (scr_plugin_t *scr, int64_t start_vpts) {
strictscr_t *this = (strictscr_t*) scr;
pthread_mutex_lock (&this->lock);
@@ -99,11 +99,11 @@ static void strictscr_start (scr_plugin_t *scr, uint32_t start_vpts) {
pthread_mutex_unlock (&this->lock);
}
-static uint32_t strictscr_get_current (scr_plugin_t *scr) {
+static int64_t strictscr_get_current (scr_plugin_t *scr) {
strictscr_t *this = (strictscr_t*) scr;
struct timeval tv;
- uint32_t pts;
+ int64_t pts;
double pts_calc;
pthread_mutex_lock (&this->lock);
@@ -139,4 +139,4 @@ strictscr_t* strictscr_init () {
return this;
}
-
+
diff --git a/src/input/strict_scr.h b/src/input/strict_scr.h
index 934060c4c..39d8bb8bf 100644
--- a/src/input/strict_scr.h
+++ b/src/input/strict_scr.h
@@ -29,7 +29,7 @@ typedef struct strictscr_s {
scr_plugin_t scr;
struct timeval cur_time;
- uint32_t cur_pts;
+ int64_t cur_pts;
double speed_factor;
int adjustable;