[vlc-devel] [PATCH 06/18] input: remove INPUT_GET_ES_OBJECTS

[Thomas Guillem]

This is now directly handled by the player.
---
 include/vlc_input.h | 12 ------------
 src/input/control.c | 10 ----------
 2 files changed, 22 deletions(-)

diff --git a/include/vlc_input.h b/include/vlc_input.h
index aa1c64b254..13326b891a 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -577,7 +577,6 @@ enum input_query_e
      * XXX You must release as soon as possible */
     INPUT_GET_AOUT,         /* arg1=audio_output_t **              res=can fail */
     INPUT_GET_VOUTS,        /* arg1=vout_thread_t ***, size_t *        res=can fail */
-    INPUT_GET_ES_OBJECTS,   /* arg1=int id, vlc_object_t **dec */
 
     /* Renderers */
     INPUT_SET_RENDERER,     /* arg1=vlc_renderer_item_t* */
@@ -707,17 +706,6 @@ static inline audio_output_t *input_GetAout( input_thread_t *p_input )
      return input_Control( p_input, INPUT_GET_AOUT, &p_aout ) ? NULL : p_aout;
 }
 
-/**
- * Returns the objects associated to an ES.
- *
- * You may set pointer of pointer to NULL to avoid retrieving it.
- */
-static inline int input_GetEsObjects( input_thread_t *p_input, int i_id,
-                                      vlc_object_t **pp_decoder )
-{
-    return input_Control( p_input, INPUT_GET_ES_OBJECTS, i_id, pp_decoder );
-}
-
 /**
  * \see input_clock_GetSystemOrigin
  */
diff --git a/src/input/control.c b/src/input/control.c
index 189b7270ab..06fd324591 100644
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -290,16 +290,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             return VLC_SUCCESS;
         }
 
-        case INPUT_GET_ES_OBJECTS:
-        {
-            const int i_id = va_arg( args, int );
-            vlc_object_t **pp_decoder = va_arg( args, vlc_object_t ** );
-
-            return es_out_Control( priv->p_es_out_display,
-                                   ES_OUT_GET_ES_OBJECTS_BY_ID, i_id,
-                                   pp_decoder );
-        }
-
         case INPUT_GET_PCR_SYSTEM:
         {
             vlc_tick_t *pi_system = va_arg( args, vlc_tick_t * );
-- 
2.20.1