From 01729e7a1841d8aae7be37707dbc7146348c9a64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Wallm=C3=A9nius?= Date: Fri, 15 Aug 2008 08:27:39 +0000 Subject: 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 --- apps/root_menu.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'apps/root_menu.c') 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(); -- cgit v1.1