[vlc-commits] es_out: remove ES_OUT_GET_ES_OBJECTS_BY_ID

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri May 10 15:10:16 2019 +0200| [6a876e8efa67ec348582534589016e81793ca3fc] | committer: Thomas Guillem

es_out: remove ES_OUT_GET_ES_OBJECTS_BY_ID

This is now directly handled by the player.

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

 src/input/es_out.c           | 11 -----------
 src/input/es_out.h           |  1 -
 src/input/es_out_timeshift.c |  1 -
 3 files changed, 13 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 2026fb8c22..289117f22d 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2944,17 +2944,6 @@ static int EsOutVaControlLocked( es_out_t *out, int i_query, va_list args )
         return i_ret;
     }
 
-    case ES_OUT_GET_ES_OBJECTS_BY_ID:
-    {
-        const int i_id = va_arg( args, int );
-        es_out_id_t *p_es = EsOutGetFromID( out, i_id );
-        if( !p_es )
-            return VLC_EGENERIC;
-
-        *va_arg( args, vlc_object_t ** ) = VLC_OBJECT(p_es->p_dec);
-        return VLC_SUCCESS;
-    }
-
     case ES_OUT_GET_BUFFERING:
     {
         bool *pb = va_arg( args, bool* );
diff --git a/src/input/es_out.h b/src/input/es_out.h
index 7cbea71728..36aeae820f 100644
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -47,7 +47,6 @@ enum es_out_query_private_e
     ES_OUT_SET_ES_BY_ID,                            /* arg1= int, arg2= bool (forced) */
     ES_OUT_RESTART_ES_BY_ID,
     ES_OUT_SET_ES_DEFAULT_BY_ID,
-    ES_OUT_GET_ES_OBJECTS_BY_ID,                    /* arg1=int id, vlc_object_t **dec res=can fail*/
 
     /* Stop all selected ES and save the stopped state in a context. free the
      * context or call ES_OUT_STOP_ALL_ES */
diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 406c6f2237..74c48f0088 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -740,7 +740,6 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args )
     case ES_OUT_SET_ES_BY_ID:
     case ES_OUT_RESTART_ES_BY_ID:
     case ES_OUT_SET_ES_DEFAULT_BY_ID:
-    case ES_OUT_GET_ES_OBJECTS_BY_ID:
     case ES_OUT_STOP_ALL_ES:
     case ES_OUT_START_ALL_ES:
     case ES_OUT_SET_DELAY: