vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jan 31 18:49:46 2013 +0200| [d66f3ddc20969df03a670422a829c930e495a8ad] | committer: Rémi Denis-Courmont
hotkeys: remove unused OSD menu actions > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d66f3ddc20969df03a670422a829c930e495a8ad --- include/vlc_keys.h | 7 ------- modules/control/hotkeys.c | 22 ---------------------- src/config/keys.c | 7 ------- 3 files changed, 36 deletions(-) diff --git a/include/vlc_keys.h b/include/vlc_keys.h index 6cc9b2c..2040524 100644 --- a/include/vlc_keys.h +++ b/include/vlc_keys.h @@ -197,13 +197,6 @@ typedef enum vlc_action { ACTIONID_LOOP, ACTIONID_WALLPAPER, ACTIONID_LEAVE_FULLSCREEN, - ACTIONID_MENU_ON, - ACTIONID_MENU_OFF, - ACTIONID_MENU_RIGHT, - ACTIONID_MENU_LEFT, - ACTIONID_MENU_UP, - ACTIONID_MENU_DOWN, - ACTIONID_MENU_SELECT, /* Zoom */ ACTIONID_ZOOM_QUARTER, ACTIONID_ZOOM_HALF, diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index e967163..10d2ccc 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -188,28 +188,6 @@ static int PutAction( intf_thread_t *p_intf, int i_action ) var_TriggerCallback( p_intf->p_libvlc, "intf-boss" ); break; - case ACTIONID_MENU_ON: - osd_MenuShow( VLC_OBJECT(p_intf) ); - break; - case ACTIONID_MENU_OFF: - osd_MenuHide( VLC_OBJECT(p_intf) ); - break; - case ACTIONID_MENU_LEFT: - osd_MenuPrev( VLC_OBJECT(p_intf) ); - break; - case ACTIONID_MENU_RIGHT: - osd_MenuNext( VLC_OBJECT(p_intf) ); - break; - case ACTIONID_MENU_UP: - osd_MenuUp( VLC_OBJECT(p_intf) ); - break; - case ACTIONID_MENU_DOWN: - osd_MenuDown( VLC_OBJECT(p_intf) ); - break; - case ACTIONID_MENU_SELECT: - osd_MenuActivate( VLC_OBJECT(p_intf) ); - break; - /* Playlist actions (including audio) */ case ACTIONID_LOOP: /* Toggle Normal -> Loop -> Repeat -> Normal ... */ diff --git a/src/config/keys.c b/src/config/keys.c index 58c70c0..7b429ed 100644 --- a/src/config/keys.c +++ b/src/config/keys.c @@ -298,13 +298,6 @@ static const struct action actions[] = { "jump-short", ACTIONID_JUMP_BACKWARD_SHORT, }, { "leave-fullscreen", ACTIONID_LEAVE_FULLSCREEN, }, { "loop", ACTIONID_LOOP, }, - { "menu-down", ACTIONID_MENU_DOWN, }, - { "menu-left", ACTIONID_MENU_LEFT, }, - { "menu-off", ACTIONID_MENU_OFF, }, - { "menu-on", ACTIONID_MENU_ON, }, - { "menu-right", ACTIONID_MENU_RIGHT, }, - { "menu-select", ACTIONID_MENU_SELECT, }, - { "menu-up", ACTIONID_MENU_UP, }, { "nav-activate", ACTIONID_NAV_ACTIVATE, }, { "nav-down", ACTIONID_NAV_DOWN, }, { "nav-left", ACTIONID_NAV_LEFT, }, _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
