[vlc-devel] [PATCH 01/33] input: remove unused second parameter of DEMUX_SET_POSITION and DEMUX_SET_TIME

[Steve Lhomme]

---
 include/vlc_demux.h |  4 ++--
 src/input/input.c   | 12 +++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 45f5416..6433f57 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -190,12 +190,12 @@ enum demux_query_e
     /* I. Common queries to access_demux and demux */
     /* POSITION double between 0.0 and 1.0 */
     DEMUX_GET_POSITION = 0x300, /* arg1= double *       res=    */
-    DEMUX_SET_POSITION,         /* arg1= double arg2= bool b_precise    res=can fail    */
+    DEMUX_SET_POSITION,         /* arg1= double         res=can fail    */
 
     /* LENGTH/TIME in microsecond, 0 if unknown */
     DEMUX_GET_LENGTH,           /* arg1= int64_t *      res=    */
     DEMUX_GET_TIME,             /* arg1= int64_t *      res=    */
-    DEMUX_SET_TIME,             /* arg1= int64_t arg2= bool b_precise   res=can fail    */
+    DEMUX_SET_TIME,             /* arg1= int64_t        res=can fail    */
 
     /**
      * \todo Document
diff --git a/src/input/input.c b/src/input/input.c
index a5d408c..976a4e3 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1588,7 +1588,7 @@ static bool Control( input_thread_t *p_input,
             /* Reset the decoders states and clock sync (before calling the demuxer */
             es_out_SetTime( p_input->p->p_es_out, -1 );
             if( demux_Control( p_input->p->master->p_demux, DEMUX_SET_POSITION,
-                               (double) f_pos, !p_input->p->b_fast_seek ) )
+                               (double) f_pos ) )
             {
                 msg_Err( p_input, "INPUT_CONTROL_SET_POSITION(_OFFSET) "
                          "%2.1f%% failed", (double)(f_pos * 100.f) );
@@ -1623,8 +1623,7 @@ static bool Control( input_thread_t *p_input,
             es_out_SetTime( p_input->p->p_es_out, -1 );
 
             i_ret = demux_Control( p_input->p->master->p_demux,
-                                   DEMUX_SET_TIME, i_time,
-                                   !p_input->p->b_fast_seek );
+                                   DEMUX_SET_TIME, i_time );
             if( i_ret )
             {
                 int64_t i_length;
@@ -1635,8 +1634,7 @@ static bool Control( input_thread_t *p_input,
                 {
                     double f_pos = (double)i_time / (double)i_length;
                     i_ret = demux_Control( p_input->p->master->p_demux,
-                                            DEMUX_SET_POSITION, f_pos,
-                                            !p_input->p->b_fast_seek );
+                                            DEMUX_SET_POSITION, f_pos );
                 }
             }
             if( i_ret )
@@ -1891,7 +1889,7 @@ static bool Control( input_thread_t *p_input,
                 }
 
                 if( demux_Control( slave->p_demux,
-                                   DEMUX_SET_TIME, i_time, true ) )
+                                   DEMUX_SET_TIME, i_time ) )
                 {
                     msg_Err( p_input, "seek failed for new slave" );
                     InputSourceDestroy( slave );
@@ -2428,7 +2426,7 @@ static void SlaveSeek( input_thread_t *p_input )
     {
         input_source_t *in = p_input->p->slave[i];
 
-        if( demux_Control( in->p_demux, DEMUX_SET_TIME, i_time, true ) )
+        if( demux_Control( in->p_demux, DEMUX_SET_TIME, i_time ) )
         {
             if( !in->b_eof )
                 msg_Err( p_input, "seek failed for slave %d -> EOF", i );
-- 
2.6.3