vlc | branch: master | Thomas Guillem <[email protected]> | Fri May 10 15:10:00 2019 +0200| [744bc2a2ba8095cef65714ba8419e381a7380c66] | committer: Thomas Guillem
input: remove INPUT_GET_ES_OBJECTS This is now directly handled by the player. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=744bc2a2ba8095cef65714ba8419e381a7380c66 --- 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* */ @@ -708,17 +707,6 @@ static inline audio_output_t *input_GetAout( input_thread_t *p_input ) } /** - * 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 */ static inline int input_GetPcrSystem( input_thread_t *p_input, vlc_tick_t *pi_system, vlc_tick_t *pi_delay ) 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 * ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
