summaryrefslogtreecommitdiffstats
path: root/apps/plugins/mpegplayer
diff options
context:
space:
mode:
authorDavid Jilke <jilke.david@hotmail.com>2014-03-21 22:16:02 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2014-04-06 20:51:12 +0200
commitd489444119f6c734d7065cd52833f37fd7f739e8 (patch)
tree64d593a75976116713f4dbb8e68e7e394d3ff767 /apps/plugins/mpegplayer
parent8375b691e629bfbfb2a6ea213c35fe645085d9b7 (diff)
downloadrockbox-d489444119f6c734d7065cd52833f37fd7f739e8.tar.gz
rockbox-d489444119f6c734d7065cd52833f37fd7f739e8.zip
Complete Plugin Keymaps for Creative Zen X-Fi3
This patch completes the plugin keymaps for the Zen X-Fi3 and enables those plugins for compilation. One key was changed in "button-target.h" for compatibility with Rockboy. This also caused the changes to "keymap-zenxfi3.c", to keep the stock functionality (no further changes in here). Change-Id: Ic222faf89e9a9a2332a49d6e532cedb6eb16d3d7 Reviewed-on: http://gerrit.rockbox.org/762 Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com>
Diffstat (limited to 'apps/plugins/mpegplayer')
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c8
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c9
2 files changed, 17 insertions, 0 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index b5c9c6bbc8..57872bd70b 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -160,6 +160,14 @@ struct mpeg_settings settings;
#define MPEG_START_TIME_RIGHT2 BUTTON_MENU
#define MPEG_START_TIME_EXIT BUTTON_BACK
+#elif (CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD)
+#define MPEG_START_TIME_SELECT (BUTTON_PLAY|BUTTON_REL)
+#define MPEG_START_TIME_LEFT BUTTON_BACK
+#define MPEG_START_TIME_RIGHT BUTTON_MENU
+#define MPEG_START_TIME_UP BUTTON_UP
+#define MPEG_START_TIME_DOWN BUTTON_DOWN
+#define MPEG_START_TIME_EXIT (BUTTON_PLAY|BUTTON_REPEAT)
+
#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
#define MPEG_START_TIME_SELECT BUTTON_SELECT
#define MPEG_START_TIME_LEFT BUTTON_LEFT
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 467c961912..706d1546da 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -272,6 +272,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD
#define MPEG_RW BUTTON_LEFT
#define MPEG_FF BUTTON_RIGHT
+#elif CONFIG_KEYPAD == CREATIVE_ZENXFI3_PAD
+#define MPEG_MENU BUTTON_MENU
+#define MPEG_STOP (BUTTON_PLAY|BUTTON_REPEAT)
+#define MPEG_PAUSE (BUTTON_PLAY|BUTTON_REL)
+#define MPEG_VOLDOWN BUTTON_VOL_DOWN
+#define MPEG_VOLUP BUTTON_VOL_UP
+#define MPEG_RW BUTTON_DOWN
+#define MPEG_FF BUTTON_UP
+
#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
#define MPEG_MENU BUTTON_MENU
#define MPEG_STOP BUTTON_POWER