[vlc-devel] [PATCHv2 10/10] input: always use the top level es_out

[Thomas Guillem]

This commit doesn't introduce a change of behavior since private ES selection
controls will be always passed directly by timeshift.
---
 src/input/input.c | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/input/input.c b/src/input/input.c
index 0834bbd8385..c67fb2c1b1c 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2006,13 +2006,13 @@ static bool Control( input_thread_t *p_input,
             break;
 
         case INPUT_CONTROL_SET_ES:
-            if( es_out_SetEs( priv->p_es_out_display, param.id ) == VLC_SUCCESS )
+            if( es_out_SetEs( priv->p_es_out, param.id ) == VLC_SUCCESS )
                 demux_Control( input_priv(p_input)->master->p_demux, DEMUX_SET_ES,
                                vlc_es_id_GetInputId( param.id ) );
             break;
         case INPUT_CONTROL_SET_ES_LIST:
         {
-            if( es_out_SetEsList( input_priv(p_input)->p_es_out_display,
+            if( es_out_SetEsList( priv->p_es_out,
                                   param.list.cat, param.list.ids ) == VLC_SUCCESS )
             {
                 if( param.list.ids[0] != NULL && param.list.ids[1] == NULL )
@@ -2039,10 +2039,10 @@ static bool Control( input_thread_t *p_input,
             break;
         }
         case INPUT_CONTROL_UNSET_ES:
-            es_out_UnsetEs( priv->p_es_out_display, param.id );
+            es_out_UnsetEs( priv->p_es_out, param.id );
             break;
         case INPUT_CONTROL_RESTART_ES:
-            es_out_RestartEs( priv->p_es_out_display, param.id );
+            es_out_RestartEs( priv->p_es_out, param.id );
             break;
 
         case INPUT_CONTROL_SET_VIEWPOINT:
@@ -2077,12 +2077,12 @@ static bool Control( input_thread_t *p_input,
         case INPUT_CONTROL_SET_CATEGORY_DELAY:
             assert(param.cat_delay.cat == AUDIO_ES
                 || param.cat_delay.cat == SPU_ES);
-            es_out_SetDelay(priv->p_es_out_display,
+            es_out_SetDelay(priv->p_es_out,
                             param.cat_delay.cat, param.cat_delay.delay);
             break;
         case INPUT_CONTROL_SET_ES_DELAY:
             assert(param.es_delay.id);
-            es_out_SetEsDelay(priv->p_es_out_display, param.es_delay.id,
+            es_out_SetEsDelay(priv->p_es_out, param.es_delay.id,
                               param.es_delay.delay);
             break;
 
@@ -2195,7 +2195,7 @@ static bool Control( input_thread_t *p_input,
                 }
                 else
                 {
-                    if( es_out_SetRecordState( priv->p_es_out_display, val.b_bool ) )
+                    if( es_out_SetRecordState( priv->p_es_out, val.b_bool ) )
                         val.b_bool = false;
                 }
                 priv->b_recording = val.b_bool;
@@ -2232,7 +2232,7 @@ static bool Control( input_thread_t *p_input,
                 break;
 
             void *context;
-            if( es_out_StopAllEs( priv->p_es_out_display, &context ) != VLC_SUCCESS )
+            if( es_out_StopAllEs( priv->p_es_out, &context ) != VLC_SUCCESS )
                 break;
 
             if ( p_priv->p_renderer )
@@ -2254,21 +2254,21 @@ static bool Control( input_thread_t *p_input,
                                         vlc_renderer_item_demux_filter( p_item ) );
                 }
             }
-            es_out_StartAllEs( priv->p_es_out_display, context );
+            es_out_StartAllEs( priv->p_es_out, context );
 #endif
             break;
         }
         case INPUT_CONTROL_SET_VBI_PAGE:
-            es_out_SetVbiPage( priv->p_es_out_display, param.vbi_page.id,
+            es_out_SetVbiPage( priv->p_es_out, param.vbi_page.id,
                                param.vbi_page.page );
             break;
         case INPUT_CONTROL_SET_VBI_TRANSPARENCY:
-            es_out_SetVbiTransparency( priv->p_es_out_display,
+            es_out_SetVbiTransparency( priv->p_es_out,
                                        param.vbi_transparency.id,
                                        param.vbi_transparency.enabled );
             break;
         case INPUT_CONTROL_SET_ES_AUTOSELECT:
-            es_out_SetAutoSelect( priv->p_es_out_display, param.es_autoselect.cat,
+            es_out_SetAutoSelect( priv->p_es_out, param.es_autoselect.cat,
                                   param.es_autoselect.enabled );
             break;
 
-- 
2.20.1