devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

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

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24904 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Teruaki Kawashima 2010-02-25 11:11:41 +00:00
parent d95211a23d
commit 15f6bfc0e5
5 changed files with 45 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
apps/plugins/imageviewer/imageviewer.c
View file

@ -351,6 +351,9 @@ static int ask_and_get_audio_buffer(const char *filename)
return PLUGIN_OTHER;
#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)))
{