summaryrefslogtreecommitdiffstats
path: root/apps/plugins/mpegplayer
diff options
context:
space:
mode:
authorSebastian Leonhardt <sebastian.leonhardt@web.de>2014-05-22 23:34:52 +0200
committerSzymon Dziok <b0hoon@o2.pl>2014-05-24 00:50:11 +0200
commit7f7aee3f2457818547ec065ddd65bea0b3a68983 (patch)
tree84cfadca3187bf65d569cb5456c8d78245823b23 /apps/plugins/mpegplayer
parent4b181b4517fad106ab1ffbdab01adac9cf8e4bee (diff)
downloadrockbox-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.c3
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c3
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;
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define MPEG_START_TIME_EXIT BUTTON_POWER
-#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
+#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
+ (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define MPEG_START_TIME_SELECT BUTTON_PLAY
#define MPEG_START_TIME_LEFT BUTTON_LEFT
#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
#elif CONFIG_KEYPAD == ONDAVX777_PAD
#define MPEG_MENU BUTTON_POWER
-#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
+#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \
+ (CONFIG_KEYPAD == SAMSUNG_YH920_PAD)
#define MPEG_MENU BUTTON_LEFT
#define MPEG_STOP BUTTON_RIGHT
#define MPEG_PAUSE BUTTON_PLAY