[vlc-commits] Revert "input: Allow track autoselection to be enabled/disabled"

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Feb 28 13:38:41 2020 +0100| [c2266fb84f55f83942d24f15c4b6e44ead097e99] | committer: Thomas Guillem

Revert "input: Allow track autoselection to be enabled/disabled"

This reverts commit f800fd9ee730410072613012015d89eec1e658cf.

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

 src/input/es_out.c         | 20 --------------------
 src/input/es_out.h         |  9 ---------
 src/input/input.c          |  4 ----
 src/input/input_internal.h |  6 ------
 4 files changed, 39 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 407502f047..fe4922b512 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -3563,26 +3563,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_AUTOSELECT:
-    {
-        int i_cat = va_arg( args, int );
-        bool b_enabled = va_arg( args, int );
-        switch ( i_cat )
-        {
-            case VIDEO_ES:
-                p_sys->video.b_autoselect = b_enabled;
-                break;
-            case AUDIO_ES:
-                p_sys->audio.b_autoselect = b_enabled;
-                break;
-            case SPU_ES:
-                p_sys->sub.b_autoselect = b_enabled;
-                break;
-            default:
-                return VLC_EGENERIC;
-        }
-        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:
diff --git a/src/input/es_out.h b/src/input/es_out.h
index 4d5e239360..3d0568d4d0 100644
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -51,10 +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) */
 
-    /* Disable autoselection of tracks from a given category */
-    ES_OUT_PRIV_SET_AUTOSELECT,  /* arg1= int (es category),
-                                    arg2= int (enabled/disabled), res=can fail */
-
     /* 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,
@@ -154,11 +150,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_SetAutoSelect( es_out_t *p_out,
-                                        enum es_format_category_e cat, bool enabled )
-{
-    return es_out_PrivControl( p_out, ES_OUT_PRIV_SET_AUTOSELECT, cat, enabled );
-}
 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 );
diff --git a/src/input/input.c b/src/input/input.c
index bf880ee48b..098f96b3a8 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2345,10 +2345,6 @@ static bool Control( input_thread_t *p_input,
                                        param.vbi_transparency.id,
                                        param.vbi_transparency.enabled );
             break;
-        case INPUT_CONTROL_SET_ES_AUTOSELECT:
-            es_out_SetAutoSelect( priv->p_es_out_display, param.es_autoselect.cat,
-                                  param.es_autoselect.enabled );
-            break;
 
         case INPUT_CONTROL_NAV_ACTIVATE:
         case INPUT_CONTROL_NAV_UP:
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 6790dce755..49c6cfc6d5 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -452,10 +452,6 @@ typedef union
         vlc_es_id_t *id;
         bool enabled;
     } vbi_transparency;
-    struct {
-        enum es_format_category_e cat;
-        bool enabled;
-    } es_autoselect;
 } input_control_param_t;
 
 typedef struct
@@ -608,8 +604,6 @@ enum input_control_e
 
     INPUT_CONTROL_SET_VBI_PAGE,
     INPUT_CONTROL_SET_VBI_TRANSPARENCY,
-
-    INPUT_CONTROL_SET_ES_AUTOSELECT,
 };
 
 /* Internal helpers */