vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jan 31 18:50:19 2013 +0200| [e715fddb80751b4b4c66057c551a8caeb7ff8afe] | committer: Rémi Denis-Courmont
Old RC: remove non-working menu command > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e715fddb80751b4b4c66057c551a8caeb7ff8afe --- modules/control/rc.c | 67 -------------------------------------------------- 1 file changed, 67 deletions(-) diff --git a/modules/control/rc.c b/modules/control/rc.c index 6dc7d0f..fa45523 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -41,7 +41,6 @@ #include <vlc_interface.h> #include <vlc_aout.h> #include <vlc_vout.h> -#include <vlc_osd.h> #include <vlc_playlist.h> #include <vlc_keys.h> @@ -108,8 +107,6 @@ static int AudioDevice ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int AudioChannel ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -static int Menu ( vlc_object_t *, char const *, - vlc_value_t, vlc_value_t, void * ); static int Statistics ( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); @@ -399,9 +396,6 @@ static void RegisterCallbacks( intf_thread_t *p_intf ) ADD( "goto", INTEGER, Playlist ) ADD( "status", INTEGER, Playlist ) - /* OSD menu commands */ - ADD( "menu", STRING, Menu ) - /* DVD commands */ ADD( "pause", VOID, Input ) ADD( "seek", INTEGER, Input ) @@ -1784,67 +1778,6 @@ out: return ret; } -/* OSD menu commands */ -static int Menu( 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); - intf_thread_t *p_intf = (intf_thread_t*)p_this; - playlist_t *p_playlist = p_intf->p_sys->p_playlist; - int i_error = VLC_SUCCESS; - vlc_value_t val; - - if ( !*newval.psz_string ) - { - msg_rc( "%s", _("Please provide one of the following parameters:") ); - msg_rc( "[on|off|up|down|left|right|select]" ); - return VLC_EGENERIC; - } - - input_thread_t * p_input = playlist_CurrentInput( p_playlist ); - - if( p_input ) - { - var_Get( p_input, "state", &val ); - vlc_object_release( p_input ); - - if( ( val.i_int == PAUSE_S ) && - ( strcmp( newval.psz_string, "select" ) != 0 ) ) - { - msg_rc( "%s", _("Type 'menu select' or 'pause' to continue.") ); - return VLC_EGENERIC; - } - } - - val.psz_string = strdup( newval.psz_string ); - if( !val.psz_string ) - return VLC_ENOMEM; - if( !strcmp( val.psz_string, "on" ) || !strcmp( val.psz_string, "show" )) - osd_MenuShow( p_this ); - else if( !strcmp( val.psz_string, "off" ) - || !strcmp( val.psz_string, "hide" ) ) - osd_MenuHide( p_this ); - else if( !strcmp( val.psz_string, "up" ) ) - osd_MenuUp( p_this ); - else if( !strcmp( val.psz_string, "down" ) ) - osd_MenuDown( p_this ); - else if( !strcmp( val.psz_string, "left" ) ) - osd_MenuPrev( p_this ); - else if( !strcmp( val.psz_string, "right" ) ) - osd_MenuNext( p_this ); - else if( !strcmp( val.psz_string, "select" ) ) - osd_MenuActivate( p_this ); - else - { - msg_rc( "%s", _("Please provide one of the following parameters:") ); - msg_rc( "[on|off|up|down|left|right|select]" ); - i_error = VLC_EGENERIC; - } - - free( val.psz_string ); - return i_error; -} - static int Statistics ( vlc_object_t *p_this, char const *psz_cmd, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
