[vlc-commits] core: remove ES_OUT_SET_TIME

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri May  4 15:53:17 2018 +0200| [ce65a379235ae1f198facb2e65edea97ca4ba1b7] | committer: Rémi Denis-Courmont

core: remove ES_OUT_SET_TIME

it does the same as ES_OUT_RESET_PCR

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ce65a379235ae1f198facb2e65edea97ca4ba1b7
---

 src/input/es_out.c           | 10 ----------
 src/input/es_out.h           |  7 -------
 src/input/es_out_timeshift.c | 17 -----------------
 src/input/input.c            |  8 ++++----
 4 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index b424ea418d..840abad431 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2777,16 +2777,6 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
         return VLC_SUCCESS;
     }
 
-    case ES_OUT_SET_TIME:
-    {
-        const mtime_t i_date = va_arg( args, mtime_t );
-
-        assert( i_date == -1 );
-        EsOutChangePosition( out );
-
-        return VLC_SUCCESS;
-    }
-
     case ES_OUT_SET_FRAME_NEXT:
         EsOutFrameNext( out );
         return VLC_SUCCESS;
diff --git a/src/input/es_out.h b/src/input/es_out.h
index 8f202266e8..fc5197ca22 100644
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -71,9 +71,6 @@ enum es_out_query_private_e
     /* Set rate */
     ES_OUT_SET_RATE,                                /* arg1=int i_source_rate arg2=int i_rate                  res=can fail */
 
-    /* Set a new time */
-    ES_OUT_SET_TIME,                                /* arg1=mtime_t             res=can fail */
-
     /* Set next frame */
     ES_OUT_SET_FRAME_NEXT,                          /*                          res=can fail */
 
@@ -136,10 +133,6 @@ static inline int es_out_SetRate( es_out_t *p_out, int i_source_rate, int i_rate
 {
     return es_out_Control( p_out, ES_OUT_SET_RATE, i_source_rate, i_rate );
 }
-static inline int es_out_SetTime( es_out_t *p_out, mtime_t i_date )
-{
-    return es_out_Control( p_out, ES_OUT_SET_TIME, i_date );
-}
 static inline int es_out_SetFrameNext( es_out_t *p_out )
 {
     return es_out_Control( p_out, ES_OUT_SET_FRAME_NEXT );
diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index ebb319bb19..959820fb84 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -604,17 +604,6 @@ static int ControlLockedSetRate( es_out_t *p_out, int i_src_rate, int i_rate )
     }
     return i_ret;
 }
-static int ControlLockedSetTime( es_out_t *p_out, mtime_t i_date )
-{
-    es_out_sys_t *p_sys = p_out->p_sys;
-
-    if( !p_sys->b_delayed )
-        return es_out_SetTime( p_sys->p_out, i_date );
-
-    /* TODO */
-    msg_Err( p_sys->p_input, "EsOutTimeshift does not yet support time change" );
-    return VLC_EGENERIC;
-}
 static int ControlLockedSetFrameNext( es_out_t *p_out )
 {
     es_out_sys_t *p_sys = p_out->p_sys;
@@ -708,12 +697,6 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args )
 
         return ControlLockedSetRate( p_out, i_src_rate, i_rate );
     }
-    case ES_OUT_SET_TIME:
-    {
-        const mtime_t i_date = (mtime_t)va_arg( args, mtime_t );
-
-        return ControlLockedSetTime( p_out, i_date );
-    }
     case ES_OUT_SET_FRAME_NEXT:
     {
         return ControlLockedSetFrameNext( p_out );
diff --git a/src/input/input.c b/src/input/input.c
index 7ec984cab7..fbdb67d4ac 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1848,7 +1848,7 @@ static bool Control( input_thread_t *p_input,
             else if( f_pos > 1.f )
                 f_pos = 1.f;
             /* Reset the decoders states and clock sync (before calling the demuxer */
-            es_out_SetTime( input_priv(p_input)->p_es_out, -1 );
+            es_out_Control( input_priv(p_input)->p_es_out, ES_OUT_RESET_PCR );
             if( demux_Control( input_priv(p_input)->master->p_demux, DEMUX_SET_POSITION,
                                (double) f_pos, !input_priv(p_input)->b_fast_seek ) )
             {
@@ -1882,7 +1882,7 @@ static bool Control( input_thread_t *p_input,
                 i_time = 0;
 
             /* Reset the decoders states and clock sync (before calling the demuxer */
-            es_out_SetTime( input_priv(p_input)->p_es_out, -1 );
+            es_out_Control( input_priv(p_input)->p_es_out, ES_OUT_RESET_PCR );
 
             i_ret = demux_Control( input_priv(p_input)->master->p_demux,
                                    DEMUX_SET_TIME, i_time,
@@ -2098,7 +2098,7 @@ static bool Control( input_thread_t *p_input,
             if( i_title < 0 || i_title >= input_priv(p_input)->master->i_title )
                 break;
 
-            es_out_SetTime( input_priv(p_input)->p_es_out, -1 );
+            es_out_Control( input_priv(p_input)->p_es_out, ES_OUT_RESET_PCR );
             demux_Control( input_priv(p_input)->master->p_demux,
                            DEMUX_SET_TITLE, i_title );
             input_SendEventTitle( p_input, i_title );
@@ -2141,7 +2141,7 @@ static bool Control( input_thread_t *p_input,
              || i_seekpoint >= input_priv(p_input)->master->title[i_title]->i_seekpoint )
                 break;
 
-            es_out_SetTime( input_priv(p_input)->p_es_out, -1 );
+            es_out_Control( input_priv(p_input)->p_es_out, ES_OUT_RESET_PCR );
             demux_Control( input_priv(p_input)->master->p_demux,
                            DEMUX_SET_SEEKPOINT, i_seekpoint );
             input_SendEventSeekpoint( p_input, i_title, i_seekpoint );