X-Git-Url: http://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fvar.c;h=a3c72ab716602a0b2b8bae19754d89c026a003a9;hp=c61f3579b7f803d4daed9c59b824b993cc4d6c0a;hb=fac02ebd89c2ae371f5bf0cddc1bb5d9a01bb7e1;hpb=5b54d6769be435b2c0b475d473e4eb3e0b144623 diff --git a/src/input/var.c b/src/input/var.c index c61f3579b7..a3c72ab716 100644 --- 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 ); - } -} -