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-ondio.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-ondio.c')
-rw-r--r-- | apps/keymaps/keymap-ondio.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c index 17b7fe4aba..506444e094 100644 --- a/apps/keymaps/keymap-ondio.c +++ b/apps/keymaps/keymap-ondio.c | |||
@@ -88,12 +88,6 @@ static const struct button_mapping button_context_tree[] = { | |||
88 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 88 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
89 | }; /* button_context_listtree */ | 89 | }; /* button_context_listtree */ |
90 | 90 | ||
91 | static const struct button_mapping button_context_menu[] = { | ||
92 | { ACTION_MENU_WPS, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | ||
93 | |||
94 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
95 | }; /* button_context_menu */ | ||
96 | |||
97 | static const struct button_mapping button_context_tree_scroll_lr[] = { | 91 | static const struct button_mapping button_context_tree_scroll_lr[] = { |
98 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 92 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
99 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 93 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
@@ -205,6 +199,7 @@ const struct button_mapping* get_context_mapping( int context ) | |||
205 | case CONTEXT_PITCHSCREEN: | 199 | case CONTEXT_PITCHSCREEN: |
206 | return button_context_pitchscreen; | 200 | return button_context_pitchscreen; |
207 | case CONTEXT_TREE: | 201 | case CONTEXT_TREE: |
202 | case CONTEXT_MAINMENU: | ||
208 | if (global_settings.hold_lr_for_scroll_in_list) | 203 | if (global_settings.hold_lr_for_scroll_in_list) |
209 | return button_context_tree_scroll_lr; | 204 | return button_context_tree_scroll_lr; |
210 | /* else fall through to CUSTOM|CONTEXT_TREE */ | 205 | /* else fall through to CUSTOM|CONTEXT_TREE */ |
@@ -218,8 +213,6 @@ const struct button_mapping* get_context_mapping( int context ) | |||
218 | case CONTEXT_FM: | 213 | case CONTEXT_FM: |
219 | return button_context_radio; | 214 | return button_context_radio; |
220 | #endif | 215 | #endif |
221 | case CONTEXT_MAINMENU: | ||
222 | return button_context_menu; | ||
223 | case CONTEXT_LIST: | 216 | case CONTEXT_LIST: |
224 | default: | 217 | default: |
225 | return button_context_standard; | 218 | return button_context_standard; |