summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcoen Hirschberg <marcoen@gmail.com>2007-06-16 00:57:32 +0000
committerMarcoen Hirschberg <marcoen@gmail.com>2007-06-16 00:57:32 +0000
commitcdad9abbe1e31972cd89782188095abd9d9c28ac (patch)
tree264ba59b3c8ef9982a6c0dfb73f3470bf33e605e
parentda0084046b8817ef1d05d0e4f1bf973fe32d54a8 (diff)
downloadrockbox-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
-rw-r--r--apps/keymaps/keymap-gigabeat.c18
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[] = {
{ ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_RC_REW, BUTTON_NONE },
{ ACTION_STD_OK, BUTTON_RC_FF, BUTTON_NONE },
+ { ACTION_STD_MENU, BUTTON_RC_DSP, BUTTON_NONE },
LAST_ITEM_IN_LIST
};
@@ -293,7 +294,8 @@ static const struct button_mapping remote_button_context_wps[] = {
{ ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT },
{ ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT },
- { ACTION_WPS_STOP, BUTTON_RC_DSP, BUTTON_NONE },
+ { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY },
+ { ACTION_WPS_MENU, BUTTON_RC_DSP, BUTTON_NONE },
{ ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE },
{ ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
@@ -303,6 +305,13 @@ static const struct button_mapping remote_button_context_wps[] = {
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
};
+static const struct button_mapping remote_button_context_tree[] = {
+ { ACTION_TREE_WPS, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY },
+ { ACTION_TREE_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY },
+
+ LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+};
+
static const struct button_mapping* get_context_mapping_remote( int context )
{
context ^= CONTEXT_REMOTE;
@@ -311,10 +320,11 @@ static const struct button_mapping* get_context_mapping_remote( int context )
{
case CONTEXT_WPS:
return remote_button_context_wps;
-
- default:
- return remote_button_context_standard;
+ case CONTEXT_MAINMENU:
+ case CONTEXT_TREE:
+ return remote_button_context_tree;
}
+ return remote_button_context_standard;
}
const struct button_mapping* get_context_mapping(int context)