hotkeys: remove unused OSD menu actions
authorRémi Denis-Courmont <remi@remlab.net>
Thu, 31 Jan 2013 16:49:46 +0000 (18:49 +0200)
committerRémi Denis-Courmont <remi@remlab.net>
Thu, 31 Jan 2013 17:11:34 +0000 (19:11 +0200)
include/vlc_keys.h
modules/control/hotkeys.c
src/config/keys.c

index 6cc9b2c..2040524 100644 (file)
@@ -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,
index e967163..10d2ccc 100644 (file)
@@ -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 ... */
index 58c70c0..7b429ed 100644 (file)
@@ -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, },