summaryrefslogtreecommitdiff
path: root/apps/plugins/mpegplayer
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-10-25 07:44:56 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-10-25 07:44:56 +0000
commita256878e773000c2ac6e070b3ce115a0363ebea7 (patch)
treeb149ce74ae37ba8c434047a362b300d3a862518c /apps/plugins/mpegplayer
parent902a1b5fae62cbd7ec4733584c832a78ee6dafb2 (diff)
downloadrockbox-a256878e773000c2ac6e070b3ce115a0363ebea7.zip
rockbox-a256878e773000c2ac6e070b3ce115a0363ebea7.tar.gz
rockbox-a256878e773000c2ac6e070b3ce115a0363ebea7.tar.bz2
rockbox-a256878e773000c2ac6e070b3ce115a0363ebea7.tar.xz
enable jpeg, mpegplayer and midiplay on the mr500 (only jpeg is actually usable though, mpegplayer data aborts)
fix the config which should have been done a few commits ago git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15296 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer')
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c10
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c7
2 files changed, 17 insertions, 0 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 0a717ae..6cd5f7b 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -90,6 +90,16 @@ volatile long thumbDelayTimer;
#define MPEG_DOWN BUTTON_DOWN
#define MPEG_EXIT BUTTON_POWER
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define MPEG_SELECT BUTTON_RC_HEART
+#define MPEG_SCROLL_UP BUTTON_RC_VOL_UP
+#define MPEG_SCROLL_DOWN BUTTON_RC_VOL_DOWN
+#define MPEG_LEFT BUTTON_LEFT
+#define MPEG_RIGHT BUTTON_RIGHT
+#define MPEG_UP BUTTON_RC_PLAY
+#define MPEG_DOWN BUTTON_RC_DOWN
+#define MPEG_EXIT BUTTON_POWER
+
#else
#error MPEGPLAYER: Unsupported keypad
#endif
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 770abf9..aed96d6 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -162,6 +162,13 @@ PLUGIN_IRAM_DECLARE
#define MPEG_VOLDOWN BUTTON_VOL_DOWN
#define MPEG_VOLUP BUTTON_VOL_UP
+#elif CONFIG_KEYPAD == MROBE500_PAD
+#define MPEG_MENU BUTTON_RC_HEART
+#define MPEG_STOP BUTTON_POWER
+#define MPEG_PAUSE BUTTON_TOUCHPAD
+#define MPEG_VOLDOWN BUTTON_RC_VOL_DOWN
+#define MPEG_VOLUP BUTTON_RC_VOL_UP
+
#else
#error MPEGPLAYER: Unsupported keypad
#endif