[vlc-commits] input: rework ControlUpdateSout

[Thomas Guillem]

vlc/vlc-3.0 | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Jan 31 15:59:19 2018 +0100| [da35295b7555cbafd2f4b48f7a85fbabfa820244] | committer: Thomas Guillem

input: rework ControlUpdateSout

And rename it to ControlUpdateRenderer.

(cherry picked from commit 545f46ea0b54cd981704426bdb2fed852986053c)
Signed-off-by: Thomas Guillem <thomas at gllm.fr>

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

 src/input/input.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 93236e1924..7eafa55ce7 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1886,10 +1886,9 @@ static void ControlNav( input_thread_t *p_input, int i_type )
 }
 
 #ifdef ENABLE_SOUT
-static void ControlUpdateSout( input_thread_t *p_input, const char* psz_chain )
+static void ControlUpdateRenderer( input_thread_t *p_input, bool b_enable )
 {
-    var_SetString( p_input, "sout", psz_chain );
-    if( psz_chain && *psz_chain )
+    if( b_enable )
     {
         if( InitSout( p_input ) != VLC_SUCCESS )
         {
@@ -2334,7 +2333,7 @@ static bool Control( input_thread_t *p_input,
 
             if ( p_priv->p_renderer )
             {
-                ControlUpdateSout( p_input, NULL );
+                ControlUpdateRenderer( p_input, false );
                 demux_FilterDisable( p_priv->master->p_demux,
                         vlc_renderer_item_demux_filter( p_priv->p_renderer ) );
                 vlc_renderer_item_release( p_priv->p_renderer );
@@ -2343,7 +2342,7 @@ static bool Control( input_thread_t *p_input,
             if( p_item != NULL )
             {
                 p_priv->p_renderer = vlc_renderer_item_hold( p_item );
-                ControlUpdateSout( p_input, vlc_renderer_item_sout( p_item ) );
+                ControlUpdateRenderer( p_input, true );
                 if( !demux_FilterEnable( p_priv->master->p_demux,
                                 vlc_renderer_item_demux_filter( p_priv->p_renderer ) ) )
                 {