From 28d36642273feb5fcf227d9c5f432253e40b27e4 Mon Sep 17 00:00:00 2001
From: Thomas Guillem <thomas@gllm.fr>
Date: Fri, 28 Feb 2020 14:12:32 +0100
Subject: [PATCH] es_out: remove ES_OUT_PRIV_*ES*_BY_ID controls

This was the second last control using the legacy int id.
---
 src/input/es_out.c           | 28 ----------------------------
 src/input/es_out.h           | 17 -----------------
 src/input/es_out_timeshift.c |  3 ---
 3 files changed, 48 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 16463899f3..e19cc57a2c 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -3558,34 +3558,6 @@ static int EsOutVaPrivControlLocked( es_out_t *out, int query, va_list args )
         EsOutSelectList( out, cat, es_id_list );
         return VLC_SUCCESS;
     }
-    case ES_OUT_PRIV_SET_ES_BY_ID:
-    case ES_OUT_PRIV_RESTART_ES_BY_ID:
-    case ES_OUT_PRIV_SET_ES_DEFAULT_BY_ID:
-    {
-        const int i_id = va_arg( args, int );
-        es_out_id_t *p_es = EsOutGetFromID( out, i_id );
-        int i_new_query = 0;
-
-        switch( query )
-        {
-        case ES_OUT_PRIV_SET_ES_BY_ID:
-            i_new_query = ES_OUT_SET_ES;
-            p_es->b_forced = va_arg( args, int );
-            break;
-        case ES_OUT_PRIV_RESTART_ES_BY_ID:
-            i_new_query = ES_OUT_RESTART_ES;
-            break;
-        case ES_OUT_PRIV_SET_ES_DEFAULT_BY_ID:
-            i_new_query = ES_OUT_SET_ES_DEFAULT;
-            break;
-        default:
-          vlc_assert_unreachable();
-        }
-        int i_ret = EsOutControlLocked( out, p_sys->main_source, i_new_query,
-                                        p_es );
-
-        return i_ret;
-    }
     case ES_OUT_PRIV_STOP_ALL_ES:
     {
         es_out_id_t *es;
diff --git a/src/input/es_out.h b/src/input/es_out.h
index 3d0568d4d0..689e10edc3 100644
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -51,11 +51,6 @@ enum es_out_query_private_e
     /* Select a list of ES */
     ES_OUT_PRIV_SET_ES_LIST, /* arg1= vlc_es_id_t *const* (null terminated array) */
 
-    /* Wrapper for some ES command to work with id */
-    ES_OUT_PRIV_SET_ES_BY_ID,                       /* arg1= int, arg2= bool (forced) */
-    ES_OUT_PRIV_RESTART_ES_BY_ID,
-    ES_OUT_PRIV_SET_ES_DEFAULT_BY_ID,
-
     ES_OUT_PRIV_SET_ES_CAT_IDS, /* arg1=es_format_category_e arg2=const char *, res=cannot fail */
 
     /* Stop all selected ES and save the stopped state in a context. free the
@@ -150,18 +145,6 @@ static inline int es_out_SetEsList( es_out_t *p_out,
 {
     return es_out_PrivControl( p_out, ES_OUT_PRIV_SET_ES_LIST, cat, ids );
 }
-static inline int es_out_SetEsById( es_out_t *p_out, int id, bool forced )
-{
-    return es_out_PrivControl( p_out, ES_OUT_PRIV_SET_ES_BY_ID, id, forced );
-}
-static inline int es_out_RestartEsById( es_out_t *p_out, int id )
-{
-    return es_out_PrivControl( p_out, ES_OUT_PRIV_RESTART_ES_BY_ID, id  );
-}
-static inline int es_out_SetEsDefaultById( es_out_t *p_out, int id )
-{
-    return es_out_PrivControl( p_out, ES_OUT_PRIV_SET_ES_DEFAULT_BY_ID, id );
-}
 static inline void es_out_SetEsCatIds( es_out_t *p_out,
                                        enum es_format_category_e cat,
                                        const char *str_ids )
diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 9a1ab29996..17e9288fe8 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -821,9 +821,6 @@ static int PrivControlLocked( es_out_t *p_out, int i_query, va_list args )
     case ES_OUT_PRIV_RESTART_ES:
     case ES_OUT_PRIV_SET_ES_CAT_IDS:
     case ES_OUT_PRIV_SET_ES_LIST:
-    case ES_OUT_PRIV_SET_ES_BY_ID:
-    case ES_OUT_PRIV_RESTART_ES_BY_ID:
-    case ES_OUT_PRIV_SET_ES_DEFAULT_BY_ID:
     case ES_OUT_PRIV_STOP_ALL_ES:
     case ES_OUT_PRIV_START_ALL_ES:
     case ES_OUT_PRIV_SET_ES_DELAY:
-- 
2.11.4.GIT