summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Tataranni <g.tataranni@gmail.com>2015-02-15 18:24:52 +0100
committerGiovanni Tataranni <g.tataranni@gmail.com>2015-02-15 18:24:52 +0100
commit0f34c51522ba7cfe957aca8439dc82c7bb6920c7 (patch)
tree972307d22001c11fb2df661fd565071f811d5614
parent8a078d7853c6f994b33496198d1077a38fcd5e4b (diff)
downloadrockbox-0f34c51522ba7cfe957aca8439dc82c7bb6920c7.tar.gz
rockbox-0f34c51522ba7cfe957aca8439dc82c7bb6920c7.tar.bz2
rockbox-0f34c51522ba7cfe957aca8439dc82c7bb6920c7.zip
Creative ZEN: context menu now accessible with 'menu' key
Change-Id: I9b3cdce2ead0feee4a38b715a61a4a6cd57f8f54
-rw-r--r--apps/keymaps/keymap-zen.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/apps/keymaps/keymap-zen.c b/apps/keymaps/keymap-zen.c
index dda12959d8..d2eeca8d6d 100644
--- a/apps/keymaps/keymap-zen.c
+++ b/apps/keymaps/keymap-zen.c
@@ -65,6 +65,9 @@ static const struct button_mapping button_context_standard[] = {
{ ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
{ ACTION_STD_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
+#ifdef ZEN_HAS_CONTROL
+ { ACTION_STD_CONTEXT, BUTTON_MENU, BUTTON_NONE },
+#endif
{ ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE },
@@ -81,6 +84,9 @@ static const struct button_mapping button_context_wps[] = {
{ ACTION_WPS_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
+#ifdef ZEN_HAS_CONTROL
+ { ACTION_WPS_CONTEXT, BUTTON_MENU, BUTTON_NONE },
+#endif
{ ACTION_WPS_SKIPNEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
{ ACTION_WPS_SEEKFWD, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
@@ -172,6 +178,9 @@ static const struct button_mapping button_context_list[] = {
#ifdef CONFIG_TUNER
static const struct button_mapping button_context_radio[] = {
{ ACTION_FM_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
+#ifdef ZEN_HAS_CONTROL
+ { ACTION_FM_MENU, BUTTON_MENU, BUTTON_NONE },
+#endif
{ ACTION_FM_PLAY, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_PLAYPAUSE },
{ ACTION_FM_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE },
#ifdef ZEN_HAS_VOL