diff options
| author | Nils Wallménius <nils@rockbox.org> | 2008-08-15 08:27:39 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2008-08-15 08:27:39 +0000 |
| commit | 01729e7a1841d8aae7be37707dbc7146348c9a64 (patch) | |
| tree | 5490fd9eccdcaef39bbbb91e8a44d1caad9b2ef7 /apps/root_menu.c | |
| parent | 9464fdde2d780206e1eddba8cafbfbd4bbff83e4 (diff) | |
| download | rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.zip rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.gz rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.bz2 rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.xz | |
FS#9281 Rename of splash functions.
* Remove gui_splash()
* Rename gui_syncsplash() to splashf() and remove its voice
capabilities.
* Rename the internal splash() to splash_internal() and introduce an
externally visible splash() that handles simple splashing without
printf functionality e.g. splash(HZ, ID2P(LANG_FOO)); or splash(HZ,
"foo"); if a LANG_* id is passed it will be voiced.
* Adjust all places that called gui_syncsplash() to use the correct
variant from above.
* Export both new functions to plugins and adjust places calling
rb->splash() to use the correct variant so that we now have naming
consistency between the core and plugins.
* Fix one latent bug that would cause my sim to crash with the above
changes and correct P2STR and P2ID macros, thanks to pondlife.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18282 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/root_menu.c')
| -rw-r--r-- | apps/root_menu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c index bee17f1..7322cbd 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -127,14 +127,14 @@ static int browser(void* param) /* Maybe just needs to reboot due to delayed commit */ if (stat->commit_delayed) { - gui_syncsplash(HZ*2, ID2P(LANG_PLEASE_REBOOT)); + splash(HZ*2, ID2P(LANG_PLEASE_REBOOT)); break; } /* Check if ready status is known */ if (!stat->readyvalid) { - gui_syncsplash(0, str(LANG_TAGCACHE_BUSY)); + splash(0, str(LANG_TAGCACHE_BUSY)); continue; } @@ -178,14 +178,14 @@ static int browser(void* param) } if (stat->commit_step > 0) { - gui_syncsplash(0, "%s [%d/%d]", + splashf(0, "%s [%d/%d]", str(LANG_TAGCACHE_INIT), stat->commit_step, tagcache_get_max_commit_step()); } else { - gui_syncsplash(0, str(LANG_BUILDING_DATABASE), - stat->processed_entries); + splashf(0, str(LANG_BUILDING_DATABASE), + stat->processed_entries); } } } @@ -254,7 +254,7 @@ static int wpsscrn(void* param) } else { - gui_syncsplash(HZ*2, ID2P(LANG_NOTHING_TO_RESUME)); + splash(HZ*2, ID2P(LANG_NOTHING_TO_RESUME)); } #if LCD_DEPTH > 1 show_main_backdrop(); |