M:Robe 500: More plugin keymap changes for touchscreen

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20858 a1c6a512-1295-4272-9138-f99709370657

5 files changed, 19 insertions, 37 deletions

diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c
index 1cd8740b1a..55219e5a5e 100644
--- a/apps/plugins/cube.c
+++ b/apps/plugins/cube.c
@@ -175,14 +175,6 @@ PLUGIN_HEADER
 
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define CUBE_QUIT          BUTTON_POWER
-#define CUBE_NEXT          BUTTON_RIGHT
-#define CUBE_PREV          BUTTON_LEFT
-#define CUBE_INC           BUTTON_RC_VOL_UP
-#define CUBE_DEC           BUTTON_RC_VOL_DOWN
-#define CUBE_MODE          BUTTON_RC_MODE
-#define CUBE_PAUSE_PRE     BUTTON_RC_HEART
-#define CUBE_PAUSE         (BUTTON_RC_HEART | BUTTON_REL)
-#define CUBE_HIGHSPEED     BUTTON_RC_HEART  /* fixme: clashes with pause */
 
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 #define CUBE_QUIT          BUTTON_BACK
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c
index de2a6c441f..3a649486c0 100644
--- a/apps/plugins/mosaique.c
+++ b/apps/plugins/mosaique.c
@@ -113,8 +113,6 @@ PLUGIN_HEADER
 
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define MOSAIQUE_QUIT BUTTON_POWER
-#define MOSAIQUE_SPEED BUTTON_RC_FF
-#define MOSAIQUE_RESTART BUTTON_RC_PLAY
 
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 #define MOSAIQUE_QUIT BUTTON_BACK
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c
index 63db9ab453..2a2b0a139c 100644
--- a/apps/plugins/snow.c
+++ b/apps/plugins/snow.c
@@ -38,44 +38,41 @@ PLUGIN_HEADER
 /* variable button definitions */
 #if CONFIG_KEYPAD == PLAYER_PAD
 #define SNOW_QUIT BUTTON_STOP
+
 #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
       (CONFIG_KEYPAD == IPOD_3G_PAD) || \
       (CONFIG_KEYPAD == IPOD_1G2G_PAD)
 #define SNOW_QUIT BUTTON_MENU
+
 #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
 #define SNOW_QUIT BUTTON_PLAY
-#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
-#define SNOW_QUIT BUTTON_POWER
-#elif CONFIG_KEYPAD == GIGABEAT_PAD
-#define SNOW_QUIT BUTTON_POWER
+
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
 (CONFIG_KEYPAD == SANSA_C200_PAD) ||  \
 (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \
-(CONFIG_KEYPAD == SANSA_M200_PAD)
+(CONFIG_KEYPAD == SANSA_M200_PAD) || \
+(CONFIG_KEYPAD == MROBE500_PAD) || \
+(CONFIG_KEYPAD == IRIVER_H10_PAD) || \
+(CONFIG_KEYPAD == MROBE100_PAD) || \
+(CONFIG_KEYPAD == COWOND2_PAD) || \
+(CONFIG_KEYPAD == IAUDIO67_PAD) || \
+(CONFIG_KEYPAD == CREATIVEZVM_PAD) || \
+(CONFIG_KEYPAD == PHILIPS_HDD1630_PAD) || \
+(CONFIG_KEYPAD == ONDAVX747_PAD) || \
+(CONFIG_KEYPAD == GIGABEAT_PAD) || \
+(CONFIG_KEYPAD == IAUDIO_X5M5_PAD)
 #define SNOW_QUIT BUTTON_POWER
+
 #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD)
 #define SNOW_QUIT (BUTTON_HOME|BUTTON_REPEAT)
-#elif CONFIG_KEYPAD == IRIVER_H10_PAD
-#define SNOW_QUIT BUTTON_POWER
-#elif CONFIG_KEYPAD == MROBE500_PAD
-#define SNOW_QUIT BUTTON_POWER
-#elif CONFIG_KEYPAD == MROBE100_PAD
-#define SNOW_QUIT BUTTON_POWER
+
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 #define SNOW_QUIT BUTTON_BACK
+
 #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
 #define SNOW_QUIT BUTTON_REC
 #define SNOW_RC_QUIT BUTTON_RC_REC
-#elif CONFIG_KEYPAD == COWOND2_PAD
-#define SNOW_QUIT BUTTON_POWER
-#elif CONFIG_KEYPAD == IAUDIO67_PAD
-#define SNOW_QUIT BUTTON_POWER
-#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define SNOW_QUIT BUTTON_BACK
-#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
-#define SNOW_QUIT BUTTON_POWER
-#elif CONFIG_KEYPAD == ONDAVX747_PAD
-#define SNOW_QUIT BUTTON_POWER
+
 #else
 #define SNOW_QUIT BUTTON_OFF
 #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c
index 5c714b59ee..768ab5a20c 100644
--- a/apps/plugins/starfield.c
+++ b/apps/plugins/starfield.c
@@ -131,7 +131,7 @@ PLUGIN_HEADER
 #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT
 #define STARFIELD_TOGGLE_COLOR BUTTON_SELECT
 
-#elif (CONFIG_KEYPAD == ONDAVX747_PAD)
+#elif (CONFIG_KEYPAD == ONDAVX747_PAD) || CONFIG_KEYPAD == MROBE500_PAD
 #define STARFIELD_QUIT BUTTON_POWER
 
 #endif
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index 19ccc5006d..0221e0328f 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -140,11 +140,6 @@ PLUGIN_HEADER
 
 #elif CONFIG_KEYPAD == MROBE500_PAD
 #define STOPWATCH_QUIT BUTTON_POWER
-#define STOPWATCH_START_STOP BUTTON_RC_HEART
-#define STOPWATCH_RESET_TIMER BUTTON_RC_MODE
-#define STOPWATCH_LAP_TIMER BUTTON_RC_PLAY
-#define STOPWATCH_SCROLL_UP BUTTON_RIGHT
-#define STOPWATCH_SCROLL_DOWN BUTTON_LEFT
 
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 #define STOPWATCH_QUIT BUTTON_BACK