[vlc-devel] [PATCHv2 02/10] es_out: hide ES_OUT_SET_ES_LIST

[Thomas Guillem]

It is only used from the input_thread_t and don't need to be public.
---
 include/vlc_es_out.h                          | 1 -
 modules/access/bluray.c                       | 1 -
 modules/demux/adaptive/plumbing/FakeESOut.cpp | 1 -
 src/input/es_out.h                            | 3 +++
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 46dffa98462..d15f9aef14d 100644
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -36,7 +36,6 @@ enum es_out_query_e
 {
     /* set or change the selected ES in its category (audio/video/spu) */
     ES_OUT_SET_ES,      /* arg1= es_out_id_t*                   */
-    ES_OUT_SET_ES_LIST, /* arg1= es_out_id_t *const* (null terminated array) */
     ES_OUT_UNSET_ES,    /* arg1= es_out_id_t* res=can fail      */
     ES_OUT_RESTART_ES,  /* arg1= es_out_id_t*                   */
 
diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 90b811e1598..f0440633302 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -1543,7 +1543,6 @@ static int bluray_esOutControl(es_out_t *p_out, int i_query, va_list args)
 
         case ES_OUT_SET_ES_DEFAULT:
         case ES_OUT_SET_ES:
-        case ES_OUT_SET_ES_LIST:
         case ES_OUT_UNSET_ES:
         case ES_OUT_SET_ES_STATE:
             i_ret = VLC_EGENERIC;
diff --git a/modules/demux/adaptive/plumbing/FakeESOut.cpp b/modules/demux/adaptive/plumbing/FakeESOut.cpp
index fec642e3859..f16503b40c3 100644
--- a/modules/demux/adaptive/plumbing/FakeESOut.cpp
+++ b/modules/demux/adaptive/plumbing/FakeESOut.cpp
@@ -567,7 +567,6 @@ int FakeESOut::esOutControl(int i_query, va_list args)
         }
 
         case ES_OUT_SET_ES:
-        case ES_OUT_SET_ES_LIST:
         case ES_OUT_SET_ES_DEFAULT:
         case ES_OUT_SET_ES_STATE:
             return VLC_SUCCESS;
diff --git a/src/input/es_out.h b/src/input/es_out.h
index e6cde26366f..81592850cdc 100644
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -43,6 +43,9 @@ enum es_out_query_private_e
     /* Get date to wait before demuxing more data */
     ES_OUT_GET_WAKE_UP,                             /* arg1=vlc_tick_t*            res=cannot fail */
 
+    /* Select a list of ES */
+    ES_OUT_SET_ES_LIST, /* arg1= es_out_id_t *const* (null terminated array) */
+
     /* Wrapper for some ES command to work with id */
     ES_OUT_SET_ES_BY_ID,                            /* arg1= int, arg2= bool (forced) */
     ES_OUT_RESTART_ES_BY_ID,
-- 
2.20.1