diff options
Diffstat (limited to 'apps/plugins')
| -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 e9c9b2d..cb6b4f9 100644 --- a/apps/plugins/jpeg/jpeg.h +++ b/apps/plugins/jpeg/jpeg.h @@ -205,15 +205,6 @@ #define JPEG_PREVIOUS BUTTON_REW #elif CONFIG_KEYPAD == MROBE500_PAD -#define JPEG_ZOOM_IN BUTTON_RC_VOL_UP -#define JPEG_ZOOM_OUT BUTTON_RC_VOL_DOWN -#define JPEG_UP BUTTON_RC_PLAY -#define JPEG_DOWN BUTTON_RC_DOWN -#define JPEG_LEFT BUTTON_LEFT -#define JPEG_RIGHT BUTTON_RIGHT -#define JPEG_MENU BUTTON_POWER -#define JPEG_NEXT BUTTON_RC_HEART -#define JPEG_PREVIOUS BUTTON_RC_MODE #elif CONFIG_KEYPAD == GIGABEAT_S_PAD #define JPEG_ZOOM_IN BUTTON_VOL_UP diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index 18c6851..550cd56 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[] = { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, #elif (CONFIG_KEYPAD == MROBE500_PAD) - { PLA_UP, BUTTON_RC_PLAY, BUTTON_NONE}, - { PLA_DOWN, BUTTON_RC_DOWN, BUTTON_NONE}, - { PLA_LEFT, BUTTON_RC_REW, BUTTON_NONE}, - { PLA_RIGHT, BUTTON_RC_FF, BUTTON_NONE}, - { PLA_UP_REPEAT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE}, - { PLA_DOWN_REPEAT, BUTTON_RC_DOWN|BUTTON_REPEAT, BUTTON_NONE}, - { PLA_LEFT_REPEAT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE}, - { PLA_RIGHT_REPEAT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE}, #elif (CONFIG_KEYPAD == COWOND2_PAD) #elif CONFIG_KEYPAD == IAUDIO_M3_PAD { PLA_UP, BUTTON_RC_VOL_UP, BUTTON_NONE}, diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 89c76ef..0ade023 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -209,13 +209,15 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define MPEG_FF BUTTON_RIGHT #elif CONFIG_KEYPAD == MROBE500_PAD -#define MPEG_MENU BUTTON_RC_HEART #define MPEG_STOP BUTTON_POWER -#define MPEG_PAUSE BUTTON_TOUCHSCREEN -#define MPEG_VOLDOWN BUTTON_RC_VOL_DOWN -#define MPEG_VOLUP BUTTON_RC_VOL_UP -#define MPEG_RW BUTTON_RC_REW -#define MPEG_FF BUTTON_RC_FF + +#define MPEG_RC_MENU BUTTON_RC_HEART +#define MPEG_RC_STOP BUTTON_RC_DOWN +#define MPEG_RC_PAUSE BUTTON_RC_PLAY +#define MPEG_RC_VOLDOWN BUTTON_RC_VOL_DOWN +#define MPEG_RC_VOLUP BUTTON_RC_VOL_UP +#define MPEG_RC_RW BUTTON_RC_REW +#define MPEG_RC_FF BUTTON_RC_FF #elif CONFIG_KEYPAD == MROBE100_PAD #define MPEG_MENU BUTTON_MENU @@ -289,10 +291,10 @@ CONFIG_KEYPAD == SANSA_M200_PAD #define MPEG_PAUSE BUTTON_CENTER #endif #ifndef MPEG_VOLDOWN -#define MPEG_VOLDOWN BUTTON_TOPMIDDLE +#define MPEG_VOLDOWN BUTTON_BOTTOMMIDDLE #endif #ifndef MPEG_VOLUP -#define MPEG_VOLUP BUTTON_BOTTOMMIDDLE +#define MPEG_VOLUP BUTTON_TOPMIDDLE #endif #ifndef MPEG_RW #define MPEG_RW BUTTON_MIDLEFT |