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-e200.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'apps/keymaps/keymap-e200.c') diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index b67a7a415f..6bbad1a86c 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c @@ -48,11 +48,6 @@ static const struct button_mapping button_context_standard[] = { LAST_ITEM_IN_LIST }; /* button_context_standard */ -static const struct button_mapping button_context_menu[] = { - { ACTION_MENU_WPS, BUTTON_UP, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_menu */ static const struct button_mapping button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, @@ -237,8 +232,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; @@ -246,6 +239,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 -- cgit v1.2.3