diff options
author | Marcoen Hirschberg <marcoen@gmail.com> | 2007-06-16 00:57:32 +0000 |
---|---|---|
committer | Marcoen Hirschberg <marcoen@gmail.com> | 2007-06-16 00:57:32 +0000 |
commit | cdad9abbe1e31972cd89782188095abd9d9c28ac (patch) | |
tree | 264ba59b3c8ef9982a6c0dfb73f3470bf33e605e /apps | |
parent | da0084046b8817ef1d05d0e4f1bf973fe32d54a8 (diff) | |
download | rockbox-cdad9abbe1e31972cd89782188095abd9d9c28ac.tar.gz rockbox-cdad9abbe1e31972cd89782188095abd9d9c28ac.zip |
change the Gigabeat remote control mapping: long-play is stop. play resumes playback, the 'speaker' button brings you to the menu
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13633 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-gigabeat.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/apps/keymaps/keymap-gigabeat.c b/apps/keymaps/keymap-gigabeat.c index 465d16a85e..5fbbecc674 100644 --- a/apps/keymaps/keymap-gigabeat.c +++ b/apps/keymaps/keymap-gigabeat.c | |||
@@ -278,6 +278,7 @@ static const struct button_mapping remote_button_context_standard[] = { | |||
278 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 278 | { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
279 | { ACTION_STD_CANCEL, BUTTON_RC_REW, BUTTON_NONE }, | 279 | { ACTION_STD_CANCEL, BUTTON_RC_REW, BUTTON_NONE }, |
280 | { ACTION_STD_OK, BUTTON_RC_FF, BUTTON_NONE }, | 280 | { ACTION_STD_OK, BUTTON_RC_FF, BUTTON_NONE }, |
281 | { ACTION_STD_MENU, BUTTON_RC_DSP, BUTTON_NONE }, | ||
281 | 282 | ||
282 | LAST_ITEM_IN_LIST | 283 | LAST_ITEM_IN_LIST |
283 | }; | 284 | }; |
@@ -293,7 +294,8 @@ static const struct button_mapping remote_button_context_wps[] = { | |||
293 | { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, | 294 | { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, |
294 | { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, | 295 | { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, |
295 | 296 | ||
296 | { ACTION_WPS_STOP, BUTTON_RC_DSP, BUTTON_NONE }, | 297 | { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, |
298 | { ACTION_WPS_MENU, BUTTON_RC_DSP, BUTTON_NONE }, | ||
297 | 299 | ||
298 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 300 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
299 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 301 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -303,6 +305,13 @@ static const struct button_mapping remote_button_context_wps[] = { | |||
303 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 305 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
304 | }; | 306 | }; |
305 | 307 | ||
308 | static const struct button_mapping remote_button_context_tree[] = { | ||
309 | { ACTION_TREE_WPS, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | ||
310 | { ACTION_TREE_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, | ||
311 | |||
312 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
313 | }; | ||
314 | |||
306 | static const struct button_mapping* get_context_mapping_remote( int context ) | 315 | static const struct button_mapping* get_context_mapping_remote( int context ) |
307 | { | 316 | { |
308 | context ^= CONTEXT_REMOTE; | 317 | context ^= CONTEXT_REMOTE; |
@@ -311,10 +320,11 @@ static const struct button_mapping* get_context_mapping_remote( int context ) | |||
311 | { | 320 | { |
312 | case CONTEXT_WPS: | 321 | case CONTEXT_WPS: |
313 | return remote_button_context_wps; | 322 | return remote_button_context_wps; |
314 | 323 | case CONTEXT_MAINMENU: | |
315 | default: | 324 | case CONTEXT_TREE: |
316 | return remote_button_context_standard; | 325 | return remote_button_context_tree; |
317 | } | 326 | } |
327 | return remote_button_context_standard; | ||
318 | } | 328 | } |
319 | 329 | ||
320 | const struct button_mapping* get_context_mapping(int context) | 330 | const struct button_mapping* get_context_mapping(int context) |