diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-08-05 02:10:01 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-08-05 02:10:01 +0000 |
commit | 68c83e51bb1f188fd8759c34d90f46c7d2b38b74 (patch) | |
tree | 84b024d0a4849d8442fa36508f4de8f87ee59ee7 /apps | |
parent | d25dc3345342b8bc645d599bb251aa7eb537982d (diff) | |
download | rockbox-68c83e51bb1f188fd8759c34d90f46c7d2b38b74.tar.gz rockbox-68c83e51bb1f188fd8759c34d90f46c7d2b38b74.zip |
Accept FS#7449 - use the menu/power button for the menu and use rec to toggle slideshow mode.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14185 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/jpeg.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index ad56475ebc..0af577cfe7 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -134,7 +134,8 @@ PLUGIN_HEADER | |||
134 | #define JPEG_DOWN BUTTON_DOWN | 134 | #define JPEG_DOWN BUTTON_DOWN |
135 | #define JPEG_LEFT BUTTON_LEFT | 135 | #define JPEG_LEFT BUTTON_LEFT |
136 | #define JPEG_RIGHT BUTTON_RIGHT | 136 | #define JPEG_RIGHT BUTTON_RIGHT |
137 | #define JPEG_MENU BUTTON_REC | 137 | #define JPEG_MENU BUTTON_POWER |
138 | #define JPEG_SLIDE_SHOW BUTTON_REC | ||
138 | #define JPEG_NEXT BUTTON_SCROLL_DOWN | 139 | #define JPEG_NEXT BUTTON_SCROLL_DOWN |
139 | #define JPEG_NEXT_REPEAT (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) | 140 | #define JPEG_NEXT_REPEAT (BUTTON_SCROLL_DOWN|BUTTON_REPEAT) |
140 | #define JPEG_PREVIOUS BUTTON_SCROLL_UP | 141 | #define JPEG_PREVIOUS BUTTON_SCROLL_UP |
@@ -2719,6 +2720,14 @@ int scroll_bmp(struct t_disp* pdisp) | |||
2719 | if (entries > 0) | 2720 | if (entries > 0) |
2720 | return change_filename(DIR_NEXT); | 2721 | return change_filename(DIR_NEXT); |
2721 | break; | 2722 | break; |
2723 | |||
2724 | #ifdef JPEG_SLIDE_SHOW | ||
2725 | case JPEG_SLIDE_SHOW: | ||
2726 | slideshow_enabled = !slideshow_enabled; | ||
2727 | running_slideshow = slideshow_enabled; | ||
2728 | break; | ||
2729 | #endif | ||
2730 | |||
2722 | #ifdef JPEG_NEXT_REPEAT | 2731 | #ifdef JPEG_NEXT_REPEAT |
2723 | case JPEG_NEXT_REPEAT: | 2732 | case JPEG_NEXT_REPEAT: |
2724 | #endif | 2733 | #endif |