diff options
author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2014-05-22 23:34:52 +0200 |
---|---|---|
committer | Szymon Dziok <b0hoon@o2.pl> | 2014-05-24 00:50:11 +0200 |
commit | 7f7aee3f2457818547ec065ddd65bea0b3a68983 (patch) | |
tree | 84cfadca3187bf65d569cb5456c8d78245823b23 /apps/plugins/mpegplayer | |
parent | 4b181b4517fad106ab1ffbdab01adac9cf8e4bee (diff) | |
download | rockbox-7f7aee3f2457818547ec065ddd65bea0b3a68983.tar.gz rockbox-7f7aee3f2457818547ec065ddd65bea0b3a68983.zip |
Separate keymaps for YH-820 and YH-920/925
Although both players basically have the same keys, the
differences in the layout is rather big, so I think both
deserve their own keymaps.
(On the yh820 the FFWD/PLAY/REW buttons are located above the
direction keys, on the yh920 at the side of the player.
Furthermore the yh920/925 has a REC switch, whereas
yh820 has a push button.)
Change-Id: I0e62a1b101c387646c0bdb07ea142d9d2430ca15
Reviewed-on: http://gerrit.rockbox.org/814
Reviewed-by: Szymon Dziok <b0hoon@o2.pl>
Diffstat (limited to 'apps/plugins/mpegplayer')
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_settings.c | 3 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/mpegplayer.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 57872bd70b..26dd24113c 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -204,7 +204,8 @@ struct mpeg_settings settings; | |||
204 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 204 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
205 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 205 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
206 | 206 | ||
207 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 207 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
208 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
208 | #define MPEG_START_TIME_SELECT BUTTON_PLAY | 209 | #define MPEG_START_TIME_SELECT BUTTON_PLAY |
209 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | 210 | #define MPEG_START_TIME_LEFT BUTTON_LEFT |
210 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT | 211 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 706d1546da..2e84a870a9 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -317,7 +317,8 @@ CONFIG_KEYPAD == SANSA_M200_PAD | |||
317 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 317 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
318 | #define MPEG_MENU BUTTON_POWER | 318 | #define MPEG_MENU BUTTON_POWER |
319 | 319 | ||
320 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 320 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ |
321 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
321 | #define MPEG_MENU BUTTON_LEFT | 322 | #define MPEG_MENU BUTTON_LEFT |
322 | #define MPEG_STOP BUTTON_RIGHT | 323 | #define MPEG_STOP BUTTON_RIGHT |
323 | #define MPEG_PAUSE BUTTON_PLAY | 324 | #define MPEG_PAUSE BUTTON_PLAY |