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-h10.c b/apps/keymaps/keymap-h10.c
index c0e5614fcd..be3dc74b04 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -62,12 +62,6 @@ static const struct button_mapping remote_button_context_standard[]  = {
     LAST_ITEM_IN_LIST
 }; /* remote_button_context_standard */
 
-static const struct button_mapping button_context_menu[]  = {
-    { ACTION_MENU_WPS,        BUTTON_PLAY,       BUTTON_NONE },
-    
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
-}; /* button_context_menu */
-
 static const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,     BUTTON_PLAY|BUTTON_REL,   BUTTON_PLAY },
     { ACTION_WPS_STOP,     BUTTON_PLAY|BUTTON_REPEAT,BUTTON_PLAY },
@@ -358,8 +352,6 @@ const struct button_mapping* get_context_mapping(int context)
     {
         case CONTEXT_STD:
             return button_context_standard;
-        case CONTEXT_MAINMENU:
-            return button_context_menu;
             
         case CONTEXT_WPS:
             return button_context_wps;
@@ -367,6 +359,7 @@ const struct button_mapping* get_context_mapping(int context)
         case CONTEXT_LIST:
             return button_context_list;
         case CONTEXT_TREE:
+        case CONTEXT_MAINMENU:
             if (global_settings.hold_lr_for_scroll_in_list)
                 return button_context_listtree_scroll_without_combo;
             else