diff options
-rw-r--r-- | apps/plugins/jpeg/jpeg.h | 9 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 8 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 18 |
3 files changed, 10 insertions, 25 deletions
diff --git a/apps/plugins/jpeg/jpeg.h b/apps/plugins/jpeg/jpeg.h index e9c9b2d383..cb6b4f9123 100644 --- a/apps/plugins/jpeg/jpeg.h +++ b/apps/plugins/jpeg/jpeg.h | |||
@@ -205,15 +205,6 @@ | |||
205 | #define JPEG_PREVIOUS BUTTON_REW | 205 | #define JPEG_PREVIOUS BUTTON_REW |
206 | 206 | ||
207 | #elif CONFIG_KEYPAD == MROBE500_PAD | 207 | #elif CONFIG_KEYPAD == MROBE500_PAD |
208 | #define JPEG_ZOOM_IN BUTTON_RC_VOL_UP | ||
209 | #define JPEG_ZOOM_OUT BUTTON_RC_VOL_DOWN | ||
210 | #define JPEG_UP BUTTON_RC_PLAY | ||
211 | #define JPEG_DOWN BUTTON_RC_DOWN | ||
212 | #define JPEG_LEFT BUTTON_LEFT | ||
213 | #define JPEG_RIGHT BUTTON_RIGHT | ||
214 | #define JPEG_MENU BUTTON_POWER | ||
215 | #define JPEG_NEXT BUTTON_RC_HEART | ||
216 | #define JPEG_PREVIOUS BUTTON_RC_MODE | ||
217 | 208 | ||
218 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | 209 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD |
219 | #define JPEG_ZOOM_IN BUTTON_VOL_UP | 210 | #define JPEG_ZOOM_IN BUTTON_VOL_UP |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 18c6851827..550cd56d48 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -151,14 +151,6 @@ const struct button_mapping generic_directions[] = | |||
151 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 151 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
152 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 152 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
153 | #elif (CONFIG_KEYPAD == MROBE500_PAD) | 153 | #elif (CONFIG_KEYPAD == MROBE500_PAD) |
154 | { PLA_UP, BUTTON_RC_PLAY, BUTTON_NONE}, | ||
155 | { PLA_DOWN, BUTTON_RC_DOWN, BUTTON_NONE}, | ||
156 | { PLA_LEFT, BUTTON_RC_REW, BUTTON_NONE}, | ||
157 | { PLA_RIGHT, BUTTON_RC_FF, BUTTON_NONE}, | ||
158 | { PLA_UP_REPEAT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | ||
159 | { PLA_DOWN_REPEAT, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE}, | ||
160 | { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, | ||
161 | { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, | ||
162 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | 154 | #elif (CONFIG_KEYPAD == COWOND2_PAD) |
163 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 155 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
164 | { PLA_UP, BUTTON_RC_VOL_UP, BUTTON_NONE}, | 156 | { PLA_UP, BUTTON_RC_VOL_UP, BUTTON_NONE}, |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 89c76efd98..0ade023185 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -209,13 +209,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
209 | #define MPEG_FF BUTTON_RIGHT | 209 | #define MPEG_FF BUTTON_RIGHT |
210 | 210 | ||
211 | #elif CONFIG_KEYPAD == MROBE500_PAD | 211 | #elif CONFIG_KEYPAD == MROBE500_PAD |
212 | #define MPEG_MENU BUTTON_RC_HEART | ||
213 | #define MPEG_STOP BUTTON_POWER | 212 | #define MPEG_STOP BUTTON_POWER |
214 | #define MPEG_PAUSE BUTTON_TOUCHSCREEN | 213 | |
215 | #define MPEG_VOLDOWN BUTTON_RC_VOL_DOWN | 214 | #define MPEG_RC_MENU BUTTON_RC_HEART |
216 | #define MPEG_VOLUP BUTTON_RC_VOL_UP | 215 | #define MPEG_RC_STOP BUTTON_RC_DOWN |
217 | #define MPEG_RW BUTTON_RC_REW | 216 | #define MPEG_RC_PAUSE BUTTON_RC_PLAY |
218 | #define MPEG_FF BUTTON_RC_FF | 217 | #define MPEG_RC_VOLDOWN BUTTON_RC_VOL_DOWN |
218 | #define MPEG_RC_VOLUP BUTTON_RC_VOL_UP | ||
219 | #define MPEG_RC_RW BUTTON_RC_REW | ||
220 | #define MPEG_RC_FF BUTTON_RC_FF | ||
219 | 221 | ||
220 | #elif CONFIG_KEYPAD == MROBE100_PAD | 222 | #elif CONFIG_KEYPAD == MROBE100_PAD |
221 | #define MPEG_MENU BUTTON_MENU | 223 | #define MPEG_MENU BUTTON_MENU |
@@ -289,10 +291,10 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
289 | #define MPEG_PAUSE BUTTON_CENTER | 291 | #define MPEG_PAUSE BUTTON_CENTER |
290 | #endif | 292 | #endif |
291 | #ifndef MPEG_VOLDOWN | 293 | #ifndef MPEG_VOLDOWN |
292 | #define MPEG_VOLDOWN BUTTON_TOPMIDDLE | 294 | #define MPEG_VOLDOWN BUTTON_BOTTOMMIDDLE |
293 | #endif | 295 | #endif |
294 | #ifndef MPEG_VOLUP | 296 | #ifndef MPEG_VOLUP |
295 | #define MPEG_VOLUP BUTTON_BOTTOMMIDDLE | 297 | #define MPEG_VOLUP BUTTON_TOPMIDDLE |
296 | #endif | 298 | #endif |
297 | #ifndef MPEG_RW | 299 | #ifndef MPEG_RW |
298 | #define MPEG_RW BUTTON_MIDLEFT | 300 | #define MPEG_RW BUTTON_MIDLEFT |