imageviewer: add button to quit plugin immediately if there is enough key for it.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24904 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 24 insertions, 6 deletions

diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c
index 5c6bcc918f..f82ba771a9 100644
--- a/apps/plugins/imageviewer/imageviewer.c
+++ b/apps/plugins/imageviewer/imageviewer.c
@@ -352,6 +352,9 @@ static int ask_and_get_audio_buffer(const char *filename)
 #ifdef IMGVIEW_RC_MENU
             case IMGVIEW_RC_MENU:
 #endif
+#ifdef IMGVIEW_QUIT
+            case IMGVIEW_QUIT:
+#endif
             case IMGVIEW_MENU:
                 return PLUGIN_OK;
 
@@ -374,7 +377,6 @@ static int ask_and_get_audio_buffer(const char *filename)
                 if(rb->default_event_handler_ex(button, cleanup, NULL)
                         == SYS_USB_CONNECTED)
                     return PLUGIN_USB_CONNECTED;
-
         }
     }
 }
@@ -594,6 +596,10 @@ static int scroll_bmp(struct image_info *info)
         case IMGVIEW_RC_MENU:
 #endif
         case IMGVIEW_MENU:
+#ifdef IMGVIEW_MENU_PRE
+            if (lastbutton != IMGVIEW_MENU_PRE)
+                break;
+#endif
 #ifdef USEGSLIB
             grey_show(false); /* switch off greyscale overlay */
 #endif
@@ -609,6 +615,12 @@ static int scroll_bmp(struct image_info *info)
 #endif
             break;
 
+#ifdef IMGVIEW_QUIT
+            case IMGVIEW_QUIT:
+            return PLUGIN_OK;
+            break;
+#endif
+
         default:
             if (rb->default_event_handler_ex(button, cleanup, NULL)
                 == SYS_USB_CONNECTED)
@@ -835,8 +847,7 @@ static int load_and_show(char* filename, struct image_info *info)
 #endif
         rb->lcd_clear_display();
     }
-    while (status != PLUGIN_OK && status != PLUGIN_USB_CONNECTED
-            && status != PLUGIN_OTHER);
+    while (status > PLUGIN_OTHER);
 #ifdef USEGSLIB
     rb->lcd_update();
 #endif
@@ -902,8 +913,7 @@ enum plugin_status plugin_start(const void* parameter)
     do
     {
         condition = load_and_show(np_file, &image_info);
-    } while (condition != PLUGIN_OK && condition != PLUGIN_USB_CONNECTED
-            && condition != PLUGIN_ERROR);
+    } while (condition >= PLUGIN_OTHER);
 
     if (rb->memcmp(&settings, &old_settings, sizeof (settings)))
     {
diff --git a/apps/plugins/imageviewer/imageviewer.h b/apps/plugins/imageviewer/imageviewer.h
index 694056ed8a..2f63792726 100644
--- a/apps/plugins/imageviewer/imageviewer.h
+++ b/apps/plugins/imageviewer/imageviewer.h
@@ -88,6 +88,7 @@
 #define IMGVIEW_NEXT        (BUTTON_SELECT | BUTTON_RIGHT)
 #define IMGVIEW_PREVIOUS    (BUTTON_SELECT | BUTTON_LEFT)
 #define IMGVIEW_MENU        (BUTTON_SELECT | BUTTON_MENU)
+#define IMGVIEW_QUIT        (BUTTON_SELECT | BUTTON_PLAY)
 
 #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
 #define IMGVIEW_ZOOM_PRE    BUTTON_SELECT
@@ -111,6 +112,7 @@
 #define IMGVIEW_NEXT        (BUTTON_A | BUTTON_RIGHT)
 #define IMGVIEW_PREVIOUS    (BUTTON_A | BUTTON_LEFT)
 #define IMGVIEW_MENU        BUTTON_MENU
+#define IMGVIEW_QUIT        BUTTON_POWER
 
 #elif CONFIG_KEYPAD == SANSA_E200_PAD
 #define IMGVIEW_ZOOM_PRE        BUTTON_SELECT
@@ -211,6 +213,7 @@
 #define IMGVIEW_NEXT        BUTTON_NEXT
 #define IMGVIEW_PREVIOUS    BUTTON_PREV
 #define IMGVIEW_MENU        BUTTON_MENU
+#define IMGVIEW_QUIT        BUTTON_BACK
 
 #elif CONFIG_KEYPAD == MROBE100_PAD
 #define IMGVIEW_ZOOM_IN     BUTTON_SELECT
@@ -222,6 +225,7 @@
 #define IMGVIEW_NEXT        (BUTTON_DISPLAY | BUTTON_RIGHT)
 #define IMGVIEW_PREVIOUS    (BUTTON_DISPLAY | BUTTON_LEFT)
 #define IMGVIEW_MENU        BUTTON_MENU
+#define IMGVIEW_QUIT        BUTTON_POWER
 
 #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
 #define IMGVIEW_ZOOM_PRE    BUTTON_RC_PLAY
@@ -270,6 +274,7 @@
 #define IMGVIEW_NEXT        BUTTON_VIEW
 #define IMGVIEW_PREVIOUS    BUTTON_PLAYLIST
 #define IMGVIEW_MENU        BUTTON_MENU
+#define IMGVIEW_QUIT        BUTTON_POWER
 
 #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD
 #define IMGVIEW_ZOOM_IN     BUTTON_VOL_UP
@@ -281,6 +286,7 @@
 #define IMGVIEW_NEXT        BUTTON_RIGHT
 #define IMGVIEW_PREVIOUS    BUTTON_LEFT
 #define IMGVIEW_MENU        BUTTON_MENU
+#define IMGVIEW_QUIT        BUTTON_POWER
 
 #elif CONFIG_KEYPAD == ONDAVX747_PAD
 #elif CONFIG_KEYPAD == ONDAVX777_PAD
@@ -294,7 +300,9 @@
 #define IMGVIEW_RIGHT       BUTTON_RIGHT
 #define IMGVIEW_NEXT        BUTTON_FFWD
 #define IMGVIEW_PREVIOUS    BUTTON_REW
-#define IMGVIEW_MENU        BUTTON_PLAY
+#define IMGVIEW_MENU_PRE    BUTTON_PLAY
+#define IMGVIEW_MENU        (BUTTON_PLAY|BUTTON_REL)
+#define IMGVIEW_QUIT        BUTTON_REC
 
 #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
 #define IMGVIEW_ZOOM_IN     (BUTTON_REC | BUTTON_UP)