summaryrefslogtreecommitdiff
path: root/apps/keymaps/keymap-ipod.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/keymaps/keymap-ipod.c')
-rw-r--r--apps/keymaps/keymap-ipod.c9
1 files changed, 1 insertions, 8 deletions
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[] = {
60 60
61 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 61 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
62}; /* button_context_tree */ 62}; /* button_context_tree */
63static const struct button_mapping button_context_menu[] = {
64 { ACTION_MENU_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
65 { ACTION_MENU_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
66
67 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
68}; /* button_context_menu */
69 63
70static const struct button_mapping button_context_tree_scroll_lr[] = { 64static const struct button_mapping button_context_tree_scroll_lr[] = {
71 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, 65 { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
@@ -190,6 +184,7 @@ const struct button_mapping* get_context_mapping(int context)
190 return button_context_wps; 184 return button_context_wps;
191 185
192 case CONTEXT_TREE: 186 case CONTEXT_TREE:
187 case CONTEXT_MAINMENU:
193 if (global_settings.hold_lr_for_scroll_in_list) 188 if (global_settings.hold_lr_for_scroll_in_list)
194 return button_context_tree_scroll_lr; 189 return button_context_tree_scroll_lr;
195 /* else fall through to CUSTOM|CONTEXT_TREE */ 190 /* else fall through to CUSTOM|CONTEXT_TREE */
@@ -198,8 +193,6 @@ const struct button_mapping* get_context_mapping(int context)
198 193
199 case CONTEXT_LIST: 194 case CONTEXT_LIST:
200 return button_context_standard; 195 return button_context_standard;
201 case CONTEXT_MAINMENU:
202 return button_context_menu;
203 196
204 case CONTEXT_SETTINGS_EQ: 197 case CONTEXT_SETTINGS_EQ:
205 case CONTEXT_SETTINGS_COLOURCHOOSER: 198 case CONTEXT_SETTINGS_COLOURCHOOSER: