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

Display error message on screen until user presses SELECT before exiting PictureFlow.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21112 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andrew Mahone 2009-05-28 07:03:13 +00:00
parent f51189cd5e
commit b6bea2dd32
1 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

30
apps/plugins/pictureflow/pictureflow.c
View file

@ -2357,6 +2357,20 @@ void draw_album_text(void)
} }
/**
Display an error message and wait for input.
*/
void error_wait(const char *message)
{
rb->lcd_clear_display();
int y;
rb->lcd_getstringsize(message, NULL, &y);
rb->lcd_putsxy(0, 0, message);
rb->lcd_putsxy(0, y, "Press SELECT to exit.");
rb->lcd_update();
while (rb->get_action(CONTEXT_STD, 1) != ACTION_STD_OK)
rb->yield();
}
/** /**
Main function that also contain the main plasma Main function that also contain the main plasma
@ -2371,7 +2385,7 @@ int main(void)
if ( ! rb->dir_exists( CACHE_PREFIX ) ) { if ( ! rb->dir_exists( CACHE_PREFIX ) ) {
if ( rb->mkdir( CACHE_PREFIX ) < 0 ) { if ( rb->mkdir( CACHE_PREFIX ) < 0 ) {
rb->splash(HZ, "Could not create directory " CACHE_PREFIX ); error_wait("Could not create directory " CACHE_PREFIX);
return PLUGIN_ERROR; return PLUGIN_ERROR;
} }
} }
@ -2383,22 +2397,22 @@ int main(void)
ALIGN_BUFFER(buf, buf_size, 4); ALIGN_BUFFER(buf, buf_size, 4);
ret = create_album_index(); ret = create_album_index();
if (ret == ERROR_BUFFER_FULL) { if (ret == ERROR_BUFFER_FULL) {
rb->splash(HZ, "Not enough memory for album names"); error_wait("Not enough memory for album names");
return PLUGIN_ERROR; return PLUGIN_ERROR;
} else if (ret == ERROR_NO_ALBUMS) { } else if (ret == ERROR_NO_ALBUMS) {
rb->splash(HZ, "No albums found. Please enable database"); error_wait("No albums found. Please enable database");
return PLUGIN_ERROR; return PLUGIN_ERROR;
} }
ALIGN_BUFFER(buf, buf_size, 4); ALIGN_BUFFER(buf, buf_size, 4);
number_of_slides = album_count; number_of_slides = album_count;
if ((cache_version != CACHE_VERSION) && !create_albumart_cache()) { if ((cache_version != CACHE_VERSION) && !create_albumart_cache()) {
rb->splash(HZ, "Could not create album art cache"); error_wait("Could not create album art cache");
return PLUGIN_ERROR; return PLUGIN_ERROR;
} }
if (!create_empty_slide(cache_version != CACHE_VERSION)) { if (!create_empty_slide(cache_version != CACHE_VERSION)) {
rb->splash(HZ, "Could not load the empty slide"); error_wait("Could not load the empty slide");
return PLUGIN_ERROR; return PLUGIN_ERROR;
} }
cache_version = CACHE_VERSION; cache_version = CACHE_VERSION;
@ -2410,7 +2424,7 @@ int main(void)
if (!grey_init(buf, buf_size, GREY_BUFFERED|GREY_ON_COP, if (!grey_init(buf, buf_size, GREY_BUFFERED|GREY_ON_COP,
LCD_WIDTH, LCD_HEIGHT, &grey_buf_used)) LCD_WIDTH, LCD_HEIGHT, &grey_buf_used))
{ {
rb->splash(HZ, "Greylib init failed!"); error_wait("Greylib init failed!");
return PLUGIN_ERROR; return PLUGIN_ERROR;
} }
grey_setfont(FONT_UI); grey_setfont(FONT_UI);
@ -2421,12 +2435,12 @@ int main(void)
if (!(empty_slide_hid = read_pfraw(EMPTY_SLIDE, 0))) if (!(empty_slide_hid = read_pfraw(EMPTY_SLIDE, 0)))
{ {
rb->splash(HZ, "Unable to load empty slide image"); error_wait("Unable to load empty slide image");
return PLUGIN_ERROR; return PLUGIN_ERROR;
} }
if (!create_pf_thread()) { if (!create_pf_thread()) {
rb->splash(HZ, "Cannot create thread!"); error_wait("Cannot create thread!");
return PLUGIN_ERROR; return PLUGIN_ERROR;
} }