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
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c
index ad56475..0af577c 100644
--- a/apps/plugins/jpeg.c
+++ b/apps/plugins/jpeg.c
@@ -134,7 +134,8 @@
#define JPEG_DOWN BUTTON_DOWN
#define JPEG_LEFT BUTTON_LEFT
#define JPEG_RIGHT BUTTON_RIGHT
-#define JPEG_MENU BUTTON_REC
+#define JPEG_MENU BUTTON_POWER
+#define JPEG_SLIDE_SHOW BUTTON_REC
#define JPEG_NEXT BUTTON_SCROLL_DOWN
#define JPEG_NEXT_REPEAT (BUTTON_SCROLL_DOWN|BUTTON_REPEAT)
#define JPEG_PREVIOUS BUTTON_SCROLL_UP
@@ -2719,6 +2720,14 @@
if (entries > 0)
return change_filename(DIR_NEXT);
break;
+
+#ifdef JPEG_SLIDE_SHOW
+ case JPEG_SLIDE_SHOW:
+ slideshow_enabled = !slideshow_enabled;
+ running_slideshow = slideshow_enabled;
+ break;
+#endif
+
#ifdef JPEG_NEXT_REPEAT
case JPEG_NEXT_REPEAT:
#endif
diff --git a/docs/CREDITS b/docs/CREDITS
index e84521b..84d8d9f 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -310,6 +310,7 @@
Tobias Schladt
John Zhou
Charles Voelger
+Gerritt Gonzales
The libmad team
The wavpack team
The ffmpeg team