summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Mahone <andrew.mahone@gmail.com>2009-05-28 10:35:42 +0000
committerAndrew Mahone <andrew.mahone@gmail.com>2009-05-28 10:35:42 +0000
commit371af77a4ae90732ee84af6ab8d80ae63176256d (patch)
treeca1acedc5835e8f75cdb108807a24c8da1c185a8
parentb6bea2dd321f712ddc62d657c89780b323a68f2b (diff)
downloadrockbox-371af77a4ae90732ee84af6ab8d80ae63176256d.tar.gz
rockbox-371af77a4ae90732ee84af6ab8d80ae63176256d.zip
Use core splash for PictureFlow's error_wait, exit error display 2s after any keypress, remove DEBUGF committed accidentally.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21113 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/plugins/pictureflow/pictureflow.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index b95a86af79..1f092d9414 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -724,7 +724,6 @@ int create_album_index(void)
724 rb->strcpy(buf, tcs.result); 724 rb->strcpy(buf, tcs.result);
725 buf_size -= l; 725 buf_size -= l;
726 buf = l + (char *)buf; 726 buf = l + (char *)buf;
727 DEBUGF("%lX: %s\n", tcs.idxfd[tag_album] ? rb->lseek(tcs.idxfd[tag_album], 0, SEEK_CUR) : -1, tcs.result);
728 album[-album_count].seek = tcs.result_seek; 727 album[-album_count].seek = tcs.result_seek;
729 old_l = l; 728 old_l = l;
730 album_count++; 729 album_count++;
@@ -2362,14 +2361,10 @@ void draw_album_text(void)
2362*/ 2361*/
2363void error_wait(const char *message) 2362void error_wait(const char *message)
2364{ 2363{
2365 rb->lcd_clear_display(); 2364 rb->splashf(0, "%s. Press any button to continue.", message);
2366 int y; 2365 while (rb->get_action(CONTEXT_STD, 1) == ACTION_NONE)
2367 rb->lcd_getstringsize(message, NULL, &y);
2368 rb->lcd_putsxy(0, 0, message);
2369 rb->lcd_putsxy(0, y, "Press SELECT to exit.");
2370 rb->lcd_update();
2371 while (rb->get_action(CONTEXT_STD, 1) != ACTION_STD_OK)
2372 rb->yield(); 2366 rb->yield();
2367 rb->sleep(2 * HZ);
2373} 2368}
2374 2369
2375/** 2370/**