hotkeys: remove unused OSD menu actions

diff --git a/include/vlc_keys.h b/include/vlc_keys.h
index 6cc9b2c294c38435724c2adaa47d81be86d479da..20405249aee7e4dd64f1dd1c66df34449566763a 100644 (file)
--- 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 e9671638185b29cb91dc8f45c14ff0a63cd4a14d..10d2ccc3f2802b00226c444f2e88cda478cd794c 100644 (file)
--- 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 58c70c0076a7ed2ae333e694c0e2e75b5ef1ce86..7b429ed716fed5e6777178e334dec72a99c0f20b 100644 (file)
--- 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, },