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-recorder.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-recorder.c')
-rw-r--r-- | apps/keymaps/keymap-recorder.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index fc781afa46..6f9aff635a 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c | |||
@@ -112,12 +112,6 @@ static const struct button_mapping button_context_tree[] = { | |||
112 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 112 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
113 | }; /* button_context_listtree */ | 113 | }; /* button_context_listtree */ |
114 | 114 | ||
115 | static const struct button_mapping button_context_menu[] = { | ||
116 | { ACTION_MENU_WPS, BUTTON_ON|BUTTON_REL, BUTTON_ON }, | ||
117 | { ACTION_MENU_STOP, BUTTON_OFF, BUTTON_NONE }, | ||
118 | { ACTION_NONE, BUTTON_ON, BUTTON_NONE }, | ||
119 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
120 | }; /* button_context_listtree */ | ||
121 | 115 | ||
122 | static const struct button_mapping button_context_tree_scroll_lr[] = { | 116 | static const struct button_mapping button_context_tree_scroll_lr[] = { |
123 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 117 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
@@ -290,6 +284,7 @@ const struct button_mapping* get_context_mapping( int context ) | |||
290 | case CONTEXT_BOOKMARKSCREEN: | 284 | case CONTEXT_BOOKMARKSCREEN: |
291 | return button_context_bmark; | 285 | return button_context_bmark; |
292 | case CONTEXT_TREE: | 286 | case CONTEXT_TREE: |
287 | case CONTEXT_MAINMENU: | ||
293 | if (global_settings.hold_lr_for_scroll_in_list) | 288 | if (global_settings.hold_lr_for_scroll_in_list) |
294 | return button_context_tree_scroll_lr; | 289 | return button_context_tree_scroll_lr; |
295 | /* else fall through to CUSTOM|1 */ | 290 | /* else fall through to CUSTOM|1 */ |
@@ -306,8 +301,6 @@ const struct button_mapping* get_context_mapping( int context ) | |||
306 | case CONTEXT_FM: | 301 | case CONTEXT_FM: |
307 | return button_context_radio; | 302 | return button_context_radio; |
308 | 303 | ||
309 | case CONTEXT_MAINMENU: | ||
310 | return button_context_menu; | ||
311 | case CONTEXT_STD: | 304 | case CONTEXT_STD: |
312 | case CONTEXT_LIST: | 305 | case CONTEXT_LIST: |
313 | default: | 306 | default: |