diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-04-08 01:33:01 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-04-08 01:33:01 +0000 |
commit | a053e58894292e1f12e4af578b9948da9cbdf76c (patch) | |
tree | d33f0888cb551dff27088c872065f338f3648f04 /apps/keymaps/keymap-e200.c | |
parent | eef96946e1e962473e9049005eec2b2d0b2f8463 (diff) | |
download | rockbox-a053e58894292e1f12e4af578b9948da9cbdf76c.tar.gz rockbox-a053e58894292e1f12e4af578b9948da9cbdf76c.zip |
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
Diffstat (limited to 'apps/keymaps/keymap-e200.c')
-rw-r--r-- | apps/keymaps/keymap-e200.c | 8 |
1 files changed, 1 insertions, 7 deletions
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[] = { | |||
48 | LAST_ITEM_IN_LIST | 48 | LAST_ITEM_IN_LIST |
49 | }; /* button_context_standard */ | 49 | }; /* button_context_standard */ |
50 | 50 | ||
51 | static const struct button_mapping button_context_menu[] = { | ||
52 | { ACTION_MENU_WPS, BUTTON_UP, BUTTON_NONE }, | ||
53 | |||
54 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
55 | }; /* button_context_menu */ | ||
56 | 51 | ||
57 | static const struct button_mapping button_context_wps[] = { | 52 | static const struct button_mapping button_context_wps[] = { |
58 | { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | 53 | { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
@@ -237,8 +232,6 @@ const struct button_mapping* get_context_mapping(int context) | |||
237 | { | 232 | { |
238 | case CONTEXT_STD: | 233 | case CONTEXT_STD: |
239 | return button_context_standard; | 234 | return button_context_standard; |
240 | case CONTEXT_MAINMENU: | ||
241 | return button_context_menu; | ||
242 | 235 | ||
243 | case CONTEXT_WPS: | 236 | case CONTEXT_WPS: |
244 | return button_context_wps; | 237 | return button_context_wps; |
@@ -246,6 +239,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
246 | case CONTEXT_LIST: | 239 | case CONTEXT_LIST: |
247 | return button_context_list; | 240 | return button_context_list; |
248 | case CONTEXT_TREE: | 241 | case CONTEXT_TREE: |
242 | case CONTEXT_MAINMENU: | ||
249 | if (global_settings.hold_lr_for_scroll_in_list) | 243 | if (global_settings.hold_lr_for_scroll_in_list) |
250 | return button_context_listtree_scroll_without_combo; | 244 | return button_context_listtree_scroll_without_combo; |
251 | else | 245 | else |