minor actions cleanup:

- CONTEXT_MAINMENU is not actually needed, use CONTEXT_TREE which does the same actions
- (gigabeat) use vol+/- in the lists to control volume (every list!) (FS#6982 in a better way)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13062 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 1 insertions, 8 deletions

diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index af28bc9e48..1c0536d242 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -79,12 +79,6 @@ static const struct button_mapping button_context_tree[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_listtree */
 
-static const struct button_mapping button_context_menu[]  = {
-    { ACTION_MENU_WPS,      BUTTON_ON,     BUTTON_NONE },
-    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_menu */
-
 static const struct button_mapping button_context_yesno[]  = {
     { ACTION_YESNO_ACCEPT,  BUTTON_PLAY,   BUTTON_NONE },
 
@@ -157,11 +151,10 @@ const struct button_mapping* get_context_mapping( int context )
             return button_context_yesno;
 
         case CONTEXT_TREE:
+        case CONTEXT_MAINMENU:
             return button_context_tree;
         case CONTEXT_BOOKMARKSCREEN:
             return button_context_bmark;
-        case CONTEXT_MAINMENU:
-            return button_context_menu;
         case CONTEXT_STD:
         case CONTEXT_LIST:
         default: