From a053e58894292e1f12e4af578b9948da9cbdf76c Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Sun, 8 Apr 2007 01:33:01 +0000 Subject: 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 --- apps/keymaps/keymap-ipod.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'apps/keymaps/keymap-ipod.c') diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 8b08f0cbd4..4e0fc1b862 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c @@ -60,12 +60,6 @@ static const struct button_mapping button_context_tree[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_tree */ -static const struct button_mapping button_context_menu[] = { - { ACTION_MENU_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, - { ACTION_MENU_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_menu */ static const struct button_mapping button_context_tree_scroll_lr[] = { { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, @@ -190,6 +184,7 @@ const struct button_mapping* get_context_mapping(int context) return button_context_wps; case CONTEXT_TREE: + case CONTEXT_MAINMENU: if (global_settings.hold_lr_for_scroll_in_list) return button_context_tree_scroll_lr; /* else fall through to CUSTOM|CONTEXT_TREE */ @@ -198,8 +193,6 @@ const struct button_mapping* get_context_mapping(int context) case CONTEXT_LIST: return button_context_standard; - case CONTEXT_MAINMENU: - return button_context_menu; case CONTEXT_SETTINGS_EQ: case CONTEXT_SETTINGS_COLOURCHOOSER: -- cgit v1.2.3