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-h1x0_h3x0.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'apps/keymaps/keymap-h1x0_h3x0.c') diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index 2640e8c336..b31ce6e6db 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c @@ -65,13 +65,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_ON, BUTTON_NONE }, - { ACTION_MENU_STOP, BUTTON_OFF, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) -}; /* button_context_menu */ - static const struct button_mapping button_context_wps[] = { { ACTION_WPS_PLAY, BUTTON_ON|BUTTON_REL, BUTTON_ON }, { ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, @@ -721,17 +714,11 @@ static const struct button_mapping button_context_radio_h300lcdremote[] = { LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) }; -static const struct button_mapping button_context_menu_remote[] = { - { ACTION_MENU_WPS, BUTTON_RC_ON, BUTTON_NONE }, - - LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST|CONTEXT_REMOTE) -}; /* the actual used tables */ static const struct button_mapping *remote_btn_ctxt_std = 0, *remote_btn_ctxt_wps = 0, - *remote_btn_ctxt_menu = button_context_menu_remote, *remote_btn_ctxt_list = 0, *remote_btn_ctxt_tree = 0, *remote_btn_ctxt_listtree_scroll_w_cmb = 0, @@ -880,8 +867,6 @@ static const struct button_mapping* get_context_mapping_remote(int context) { case CONTEXT_STD: return remote_btn_ctxt_std; - case CONTEXT_MAINMENU: - return remote_btn_ctxt_menu; case CONTEXT_WPS: /* common for all remotes */ return button_context_wps_remotescommon; @@ -891,6 +876,7 @@ static const struct button_mapping* get_context_mapping_remote(int context) case CONTEXT_LIST: return remote_btn_ctxt_list; case CONTEXT_TREE: + case CONTEXT_MAINMENU: if (global_settings.hold_lr_for_scroll_in_list) return remote_btn_ctxt_listtree_scroll_wo_cmb; else @@ -929,14 +915,13 @@ 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; 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