[vlc-devel] [PATCH 2/2] input: remove write-only memver

Thomas Guillem thomas at gllm.fr
Thu Aug 29 11:34:13 CEST 2019


---
 src/input/input.c          | 9 ++++-----
 src/input/input_internal.h | 1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index cd117ce50f..ebb1af8817 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -298,7 +298,6 @@ static input_thread_t *Create( vlc_object_t *p_parent,
     priv->b_thumbnailing = option == INPUT_CREATE_OPTION_THUMBNAILING;
     priv->b_can_pace_control = true;
     priv->i_start = 0;
-    priv->i_time = VLC_TICK_INVALID;
     priv->i_stop  = 0;
     priv->i_title_offset = input_priv(p_input)->i_seekpoint_offset = 0;
     priv->i_state = INIT_S;
@@ -526,10 +525,11 @@ static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed )
 
     if( p_priv->i_stop > 0 )
     {
-        if( demux_Control( p_demux, DEMUX_GET_TIME, &p_priv->i_time ) )
-            p_priv->i_time = VLC_TICK_INVALID;
+        vlc_tick_t i_time;
+        if( demux_Control( p_demux, DEMUX_GET_TIME, &i_time ) )
+            i_time = VLC_TICK_INVALID;
 
-        if( p_priv->i_stop <= p_priv->i_time )
+        if( p_priv->i_stop <= i_time )
             i_ret = VLC_DEMUXER_EOF;
     }
 
@@ -621,7 +621,6 @@ static void MainLoopStatistics( input_thread_t *p_input )
 
     if( demux_Control( priv->master->p_demux, DEMUX_GET_TIME, &i_time ) )
         i_time = VLC_TICK_INVALID;
-    input_priv(p_input)->i_time = i_time;
 
     if( demux_Control( priv->master->p_demux, DEMUX_GET_LENGTH, &i_length ) )
         i_length = VLC_TICK_INVALID;
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index e8c4465cb5..12613bafc6 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -467,7 +467,6 @@ typedef struct input_thread_private_t
     /* Playtime configuration and state */
     vlc_tick_t  i_start;    /* :start-time,0 by default */
     vlc_tick_t  i_stop;     /* :stop-time, 0 if none */
-    vlc_tick_t  i_time;     /* Current time */
 
     /* Output */
     bool            b_out_pace_control; /* XXX Move it ot es_sout ? */
-- 
2.20.1



More information about the vlc-devel mailing list