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

2 files changed, 17 insertions, 0 deletions

diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 0a717aeaac..6cd5f7b186 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 770abf95ca..aed96d6af9 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