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/imageviewer/imageviewer.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'apps/plugins/imageviewer/imageviewer.c') diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c index 39507a1fcf..05d2770863 100644 --- a/apps/plugins/imageviewer/imageviewer.c +++ b/apps/plugins/imageviewer/imageviewer.c @@ -553,7 +553,8 @@ static int scroll_bmp(struct image_info *info) static long ss_timeout = 0; int button; -#if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) +#if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) \ + || defined(IMGVIEW_SLIDE_SHOW_PRE) int lastbutton = BUTTON_NONE; #endif @@ -642,6 +643,13 @@ static int scroll_bmp(struct image_info *info) #ifdef IMGVIEW_SLIDE_SHOW case IMGVIEW_SLIDE_SHOW: +#ifdef IMGVIEW_SLIDE_SHOW_PRE + if (lastbutton != IMGVIEW_SLIDE_SHOW_PRE) + break; +#endif +#ifdef IMGVIEW_SLIDE_SHOW2 + case IMGVIEW_SLIDE_SHOW2: +#endif iv_api.slideshow_enabled = !iv_api.slideshow_enabled; break; #endif @@ -714,7 +722,7 @@ static int scroll_bmp(struct image_info *info) break; } /* switch */ -#if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) +#if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) || defined(IMGVIEW_SLIDE_SHOW_PRE) if (button != BUTTON_NONE) lastbutton = button; #endif -- cgit v1.2.3