diff options
author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2015-07-20 01:50:26 +0200 |
---|---|---|
committer | Gerrit Rockbox <gerrit@rockbox.org> | 2015-11-15 23:46:39 +0100 |
commit | a507bb283782ee3adb1fc9ba0c6f094108ef558c (patch) | |
tree | acae6cf04f8e34172375061b6fbdc11b6ffb84cb /apps/plugins/imageviewer/imageviewer.c | |
parent | a8758c953d50fb020b245d5739c41de113638b49 (diff) | |
download | rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.tar.gz rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.zip |
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
Diffstat (limited to 'apps/plugins/imageviewer/imageviewer.c')
-rw-r--r-- | apps/plugins/imageviewer/imageviewer.c | 12 |
1 files changed, 10 insertions, 2 deletions
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) | |||
553 | static long ss_timeout = 0; | 553 | static long ss_timeout = 0; |
554 | 554 | ||
555 | int button; | 555 | int button; |
556 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) | 556 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) \ |
557 | || defined(IMGVIEW_SLIDE_SHOW_PRE) | ||
557 | int lastbutton = BUTTON_NONE; | 558 | int lastbutton = BUTTON_NONE; |
558 | #endif | 559 | #endif |
559 | 560 | ||
@@ -642,6 +643,13 @@ static int scroll_bmp(struct image_info *info) | |||
642 | 643 | ||
643 | #ifdef IMGVIEW_SLIDE_SHOW | 644 | #ifdef IMGVIEW_SLIDE_SHOW |
644 | case IMGVIEW_SLIDE_SHOW: | 645 | case IMGVIEW_SLIDE_SHOW: |
646 | #ifdef IMGVIEW_SLIDE_SHOW_PRE | ||
647 | if (lastbutton != IMGVIEW_SLIDE_SHOW_PRE) | ||
648 | break; | ||
649 | #endif | ||
650 | #ifdef IMGVIEW_SLIDE_SHOW2 | ||
651 | case IMGVIEW_SLIDE_SHOW2: | ||
652 | #endif | ||
645 | iv_api.slideshow_enabled = !iv_api.slideshow_enabled; | 653 | iv_api.slideshow_enabled = !iv_api.slideshow_enabled; |
646 | break; | 654 | break; |
647 | #endif | 655 | #endif |
@@ -714,7 +722,7 @@ static int scroll_bmp(struct image_info *info) | |||
714 | break; | 722 | break; |
715 | 723 | ||
716 | } /* switch */ | 724 | } /* switch */ |
717 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) | 725 | #if defined(IMGVIEW_ZOOM_PRE) || defined(IMGVIEW_MENU_PRE) || defined(IMGVIEW_SLIDE_SHOW_PRE) |
718 | if (button != BUTTON_NONE) | 726 | if (button != BUTTON_NONE) |
719 | lastbutton = button; | 727 | lastbutton = button; |
720 | #endif | 728 | #endif |