From a507bb283782ee3adb1fc9ba0c6f094108ef558c Mon Sep 17 00:00:00 2001 From: Sebastian Leonhardt Date: Mon, 20 Jul 2015 01:50:26 +0200 Subject: YH8xx,YH9xx: Keymap improvement The main "innovation" in this patch are two "virtual buttons" for the record switch on YH92x targets. When the switch state changes, a single BUTTON_REC_SW_ON or .._OFF button event will be generated. Thus keymap code can react on switching, but not on the actual state of the switch. Wherever sensible, the following user scheme is applied: - use PLAY as confirm button - use REW button or Long REW to exit - use REC (YH820) or FFWD (YH92X) as modifier key for button combos Change-Id: Ic8d1db9cc6869daed8dda98990dfdf7f6fd5d5a1 --- apps/plugins/mpegplayer/mpeg_settings.c | 4 +--- apps/plugins/mpegplayer/mpegplayer.c | 11 ++++++----- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'apps/plugins/mpegplayer') diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 1a9636e8d8..1f49d4ec48 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c @@ -211,9 +211,7 @@ struct mpeg_settings settings; #define MPEG_START_TIME_RIGHT BUTTON_RIGHT #define MPEG_START_TIME_UP BUTTON_UP #define MPEG_START_TIME_DOWN BUTTON_DOWN -#define MPEG_START_TIME_LEFT2 BUTTON_REW -#define MPEG_START_TIME_RIGHT2 BUTTON_FFWD -#define MPEG_START_TIME_EXIT BUTTON_REC +#define MPEG_START_TIME_EXIT BUTTON_REW #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD #define MPEG_START_TIME_SELECT BUTTON_PLAY diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 66da5d52f7..712e6489a1 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c @@ -319,13 +319,14 @@ CONFIG_KEYPAD == SANSA_M200_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 +#define MPEG_MENU BUTTON_REW +#define MPEG_STOP (BUTTON_PLAY | BUTTON_REPEAT) +#define MPEG_PAUSE (BUTTON_PLAY | BUTTON_REL) #define MPEG_VOLDOWN BUTTON_DOWN #define MPEG_VOLUP BUTTON_UP -#define MPEG_RW BUTTON_REW -#define MPEG_FF BUTTON_FFWD +#define MPEG_RW BUTTON_LEFT +#define MPEG_FF BUTTON_RIGHT +#define MPEG_SHOW_OSD BUTTON_FFWD #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD #define MPEG_MENU BUTTON_MENU -- cgit v1.2.3