Removed intf-change-vout/rate-change/stats-change/intf-change.

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 9500b4cba3a47539dd7959e9866e4fe5fed8a69b..d336de9d5da1051954fca8af60c66c74b9525cf4 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -463,13 +463,6 @@ struct input_thread_t
  *
  * The variable used for event is
  *  - intf-event (\see input_event_type_e)
- *
- * The legacy variable used for event are
- *  - intf-change
- *  - intf-change-vout
- *  - rate-change
- *  - stats-change
- * You are advised to change to intf-event as soon as possible.
  */
 
 /**

diff --git a/src/input/var.c b/src/input/var.c
index c61f3579b7f803d4daed9c59b824b993cc4d6c0a..a3c72ab716602a0b2b8bae19754d89c026a003a9 100644 (file)
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -68,9 +68,6 @@ static int FrameNextCallback( vlc_object_t *p_this, char const *psz_cmd,
                               vlc_value_t oldval, vlc_value_t newval,
                               void *p_data );
 
-static int IntfEvent( vlc_object_t *p_this, char const *psz_cmd,
-                      vlc_value_t oldval, vlc_value_t newval, void *p_data );
-
 typedef struct
 {
     const char *psz_name;
@@ -230,24 +227,6 @@ void input_ControlVarInit ( input_thread_t *p_input )
     {
         /* Special "intf-event" variable. */
         var_Create( p_input, "intf-event", VLC_VAR_INTEGER );
-
-        /* Callback for legacy variables */
-        var_AddCallback( p_input, "intf-event", IntfEvent, NULL );
-
-        /* Legacy variable
-         * TODO remove them when unused */
-        static const char *ppsz_event[] = {
-            "intf-change",
-            "rate-change",
-            "stats-change",
-            "intf-change-vout",
-            NULL
-        };
-        for( int i = 0; ppsz_event[i] != NULL; i++ )
-        {
-            var_Create( p_input, ppsz_event[i], VLC_VAR_BOOL );
-            var_SetBool( p_input, ppsz_event[i], true );
-        }
     }
 
     /* Add all callbacks
@@ -840,21 +819,3 @@ static int FrameNextCallback( vlc_object_t *p_this, char const *psz_cmd,
     return VLC_SUCCESS;
 }
 
-static int IntfEvent( vlc_object_t *p_this, char const *psz_cmd,
-                      vlc_value_t oldval, vlc_value_t newval, void *p_data )
-{
-    VLC_UNUSED(psz_cmd); VLC_UNUSED(oldval); VLC_UNUSED(p_data);
-    switch( newval.i_int )
-    {
-    case INPUT_EVENT_RATE:
-        return var_SetBool( p_this, "rate-change", true );
-    case INPUT_EVENT_STATISTICS:
-        return var_SetBool( p_this, "stats-change", true );
-    case INPUT_EVENT_VOUT:
-        return var_SetBool( p_this, "intf-change-vout", true );
-
-    default:
-        return var_SetBool( p_this, "intf-change", true );
-    }
-}
-