[xine-cvs] CVS: xine-lib/src/input input_pvr.c,1.48,1.49 input_v4l.c,1.45,1.46

[Miguel F. <mig...@us...>]

Update of /cvsroot/xine/xine-lib/src/input
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1225/src/input

Modified Files:
	input_pvr.c input_v4l.c 
Log Message:
no objections so far: committing the fine speed control patch
(in case of major trouble just revert the patch i sent to xine-devel)


Index: input_pvr.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_pvr.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- input_pvr.c	25 Jul 2004 17:11:59 -0000	1.48
+++ input_pvr.c	2 Aug 2004 12:51:09 -0000	1.49
@@ -306,7 +306,7 @@
 
   pvrscr_set_pivot( this );
   this->xine_speed   = speed;
-  this->speed_factor = (double) speed * 90000.0 / 4.0 * 
+  this->speed_factor = (double) speed * 90000.0 / XINE_FINE_SPEED_NORMAL * 
                        this->speed_tunning;
 
   pthread_mutex_unlock (&this->lock);
@@ -319,7 +319,7 @@
 
   pvrscr_set_pivot( this );
   this->speed_tunning = factor;
-  this->speed_factor = (double) this->xine_speed * 90000.0 / 4.0 * 
+  this->speed_factor = (double) this->xine_speed * 90000.0 / XINE_FINE_SPEED_NORMAL * 
                        this->speed_tunning;
 
   pthread_mutex_unlock (&this->lock);
@@ -349,7 +349,7 @@
 
   pthread_mutex_unlock (&this->lock);
   
-  pvrscr_set_speed (&this->scr, XINE_SPEED_NORMAL);
+  pvrscr_set_speed (&this->scr, XINE_FINE_SPEED_NORMAL);
 }
 
 static int64_t pvrscr_get_current (scr_plugin_t *scr) {
@@ -384,9 +384,9 @@
 
   this = (pvrscr_t *) xine_xmalloc(sizeof(pvrscr_t));
 
-  this->scr.interface_version = 2;
+  this->scr.interface_version = 3;
   this->scr.get_priority      = pvrscr_get_priority;
-  this->scr.set_speed         = pvrscr_set_speed;
+  this->scr.set_fine_speed    = pvrscr_set_speed;
   this->scr.adjust            = pvrscr_adjust;
   this->scr.start             = pvrscr_start;
   this->scr.get_current       = pvrscr_get_current;
@@ -1128,7 +1128,7 @@
 
     case XINE_EVENT_PVR_PAUSE:
       /* ignore event if trying to pause, but already paused */
-      if(this->stream->xine->clock->speed != XINE_SPEED_PAUSE ||
+      if(_x_get_speed(this->stream) != XINE_SPEED_PAUSE ||
          !pause_data->mode)
         this->pvr_play_paused = pause_data->mode;
       break;
@@ -1185,7 +1185,7 @@
 
   pvr_input_plugin_t   *this = (pvr_input_plugin_t *) this_gen;
   buf_element_t        *buf;
-  int                   speed = this->stream->xine->clock->speed;
+  int                   speed = _x_get_speed(this->stream);
 
   if( !this->pvr_running ) {
     xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, "input_pvr: thread died, aborting\n");

Index: input_v4l.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/input/input_v4l.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- input_v4l.c	20 Jul 2004 00:50:11 -0000	1.45
+++ input_v4l.c	2 Aug 2004 12:51:10 -0000	1.46
@@ -266,7 +266,7 @@
   
   pvrscr_set_pivot( this );
   this->xine_speed   = speed;
-  this->speed_factor = (double) speed * 90000.0 / 4.0 *
+  this->speed_factor = (double) speed * 90000.0 / XINE_FINE_SPEED_NORMAL *
     this->speed_tunning;
   
   pthread_mutex_unlock (&this->lock);
@@ -312,7 +312,7 @@
   
   pthread_mutex_unlock (&this->lock);
   
-  pvrscr_set_speed (&this->scr, XINE_SPEED_NORMAL);
+  pvrscr_set_speed (&this->scr, XINE_FINE_SPEED_NORMAL);
 }
 
 static int64_t pvrscr_get_current (scr_plugin_t *scr)
@@ -349,9 +349,9 @@
    
    this = (pvrscr_t *) xine_xmalloc(sizeof(pvrscr_t));
    
-   this->scr.interface_version = 2;
+   this->scr.interface_version = 3;
    this->scr.get_priority      = pvrscr_get_priority;
-   this->scr.set_speed         = pvrscr_set_speed;
+   this->scr.set_fine_speed    = pvrscr_set_speed;
    this->scr.adjust            = pvrscr_adjust;
    this->scr.start             = pvrscr_start;
    this->scr.get_current       = pvrscr_get_current;
@@ -1228,7 +1228,7 @@
   buf_element_t        *buf = NULL;
   uint8_t              *ptr;
   static char           video = 0;
-  int                   speed = this->stream->xine->clock->speed;
+  int                   speed = _x_get_speed(this->stream);
     
   v4l_event_handler(this);