summaryrefslogtreecommitdiff
path: root/apps/plugins/mpegplayer
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2018-06-28 06:24:26 -0400
committerMichael Giacomelli <giac2000@hotmail.com>2018-07-28 10:56:31 -0400
commit0662793ca0050e823cd1207cc4689a1cba5068bd (patch)
tree08cd2ec59c9044c96b697b5bf8d0640841d044e0 /apps/plugins/mpegplayer
parentb3e2bd619b1b7ea94ef29d32db48e80b347a1990 (diff)
downloadrockbox-0662793ca0050e823cd1207cc4689a1cba5068bd.tar.gz
rockbox-0662793ca0050e823cd1207cc4689a1cba5068bd.zip
Add cleaned-up xDuoo X3 support
Cleaned up, rebased, and forward-ported from the xvortex fork. (original credit to vsoftster@gmail.com) Change-Id: Ibcc023a0271ea81e901450a88317708c2683236d Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Diffstat (limited to 'apps/plugins/mpegplayer')
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c10
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c9
2 files changed, 19 insertions, 0 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index dadfccf291..7976f5f542 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -306,6 +306,16 @@ struct mpeg_settings settings;
306#define MPEG_START_TIME_DOWN BUTTON_DOWN 306#define MPEG_START_TIME_DOWN BUTTON_DOWN
307#define MPEG_START_TIME_EXIT BUTTON_POWER 307#define MPEG_START_TIME_EXIT BUTTON_POWER
308 308
309#elif CONFIG_KEYPAD == XDUOO_X3_PAD
310#define MPEG_START_TIME_SELECT BUTTON_PLAY
311#define MPEG_START_TIME_LEFT BUTTON_PREV
312#define MPEG_START_TIME_RIGHT BUTTON_NEXT
313#define MPEG_START_TIME_UP BUTTON_HOME
314#define MPEG_START_TIME_DOWN BUTTON_OPTION
315#define MPEG_START_TIME_LEFT2 BUTTON_VOL_UP
316#define MPEG_START_TIME_RIGHT2 BUTTON_VOL_DOWN
317#define MPEG_START_TIME_EXIT BUTTON_POWER
318
309#else 319#else
310#error No keymap defined! 320#error No keymap defined!
311#endif 321#endif
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 07cf8ba8e2..fd3e8d8cd5 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -441,6 +441,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD
441#define MPEG_RW BUTTON_LEFT 441#define MPEG_RW BUTTON_LEFT
442#define MPEG_FF BUTTON_RIGHT 442#define MPEG_FF BUTTON_RIGHT
443 443
444#elif CONFIG_KEYPAD == XDUOO_X3_PAD
445#define MPEG_MENU BUTTON_PLAY
446#define MPEG_STOP BUTTON_POWER
447#define MPEG_PAUSE BUTTON_HOME
448#define MPEG_VOLDOWN BUTTON_VOL_DOWN
449#define MPEG_VOLUP BUTTON_VOL_UP
450#define MPEG_RW BUTTON_PREV
451#define MPEG_FF BUTTON_NEXT
452
444#else 453#else
445#error No keymap defined! 454#error No keymap defined!
446#endif 455#endif