[vlc-devel] [PATCH 28/30] sout: remove constant sout_input_IsEmpty()

[Rémi Denis-Courmont]

This always returns true.
---
 include/vlc_sout.h                |  1 -
 src/input/decoder.c               |  2 +-
 src/stream_output/stream_output.c | 12 ------------
 src/stream_output/stream_output.h |  1 -
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index 9ce24fe381..c0701360a4 100644
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -167,7 +167,6 @@ static inline int sout_MuxControl( sout_mux_t *p_mux, int i_query, ... )
 /** @} */
 
 enum sout_stream_query_e {
-    SOUT_STREAM_EMPTY,    /* arg1=bool *,       res=can fail (assume true) */
     SOUT_STREAM_WANTS_SUBSTREAMS,  /* arg1=bool *, res=can fail (assume false) */
     SOUT_STREAM_ID_SPU_HIGHLIGHT,  /* arg1=void *, arg2=const vlc_spu_highlight_t *, res=can fail */
     SOUT_STREAM_IS_SYNCHRONOUS, /* arg1=bool *, can fail (assume false) */
diff --git a/src/input/decoder.c b/src/input/decoder.c
index cc3f69d740..19b17dda0e 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -2228,7 +2228,7 @@ bool vlc_input_decoder_IsEmpty( vlc_input_decoder_t * p_owner )
     vlc_mutex_lock( &p_owner->lock );
 #ifdef ENABLE_SOUT
     if( p_owner->p_sout_input != NULL )
-        b_empty = sout_InputIsEmpty( p_owner->p_sout_input );
+        b_empty = true;
     else
 #endif
     if( p_owner->fmt.i_cat == VIDEO_ES && p_owner->p_vout != NULL )
diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c
index c86ad8d7a3..5dcc327c0f 100644
--- a/src/stream_output/stream_output.c
+++ b/src/stream_output/stream_output.c
@@ -209,18 +209,6 @@ int sout_InputDelete( sout_packetizer_input_t *p_input )
     return( VLC_SUCCESS);
 }
 
-bool sout_InputIsEmpty( sout_packetizer_input_t *p_input )
-{
-    sout_instance_t *p_sout = p_input->p_sout;
-    bool b;
-
-    vlc_mutex_lock( &p_sout->lock );
-    if( sout_StreamControl( p_sout->p_stream, SOUT_STREAM_EMPTY, &b ) != VLC_SUCCESS )
-        b = true;
-    vlc_mutex_unlock( &p_sout->lock );
-    return b;
-}
-
 static int sout_InputControlVa( sout_packetizer_input_t *p_input, int i_query, va_list args )
 {
     sout_instance_t *p_sout = p_input->p_sout;
diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index 3c12abd127..0260165ba4 100644
--- a/src/stream_output/stream_output.h
+++ b/src/stream_output/stream_output.h
@@ -60,7 +60,6 @@ bool sout_instance_ControlsPace( sout_instance_t *sout );
 sout_packetizer_input_t *sout_InputNew( sout_instance_t *, const es_format_t * );
 int sout_InputDelete( sout_packetizer_input_t * );
 int sout_InputSendBuffer( sout_packetizer_input_t *, block_t* );
-bool sout_InputIsEmpty(sout_packetizer_input_t *);
 
 enum sout_input_query_e
 {
-- 
2.28.0