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

1 files changed, 5 insertions, 5 deletions

diff --git a/apps/main.c b/apps/main.c
index ecc80710a1..1f2625df6c 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -162,7 +162,7 @@ static int init_dircache(bool preinit)
             {
                 /* This will be in default language, settings are not
                    applied yet. Not really any easy way to fix that. */
-                gui_syncsplash(0, str(LANG_SCANNING_DISK));
+                splash(0, str(LANG_SCANNING_DISK));
                 clear = true;
             }
             
@@ -180,7 +180,7 @@ static int init_dircache(bool preinit)
         {
             if (global_status.dircache_size <= 0)
             {
-                gui_syncsplash(0, str(LANG_SCANNING_DISK));
+                splash(0, str(LANG_SCANNING_DISK));
                 clear = true;
             }
             result = dircache_build(global_status.dircache_size);
@@ -191,7 +191,7 @@ static int init_dircache(bool preinit)
             /* Initialization of dircache failed. Manual action is
              * necessary to enable dircache again.
              */
-            gui_syncsplash(0, "Dircache failed, disabled. Result: %d", result);
+            splashf(0, "Dircache failed, disabled. Result: %d", result);
             global_settings.dircache = false;
         }
             
@@ -244,7 +244,7 @@ static void init_tagcache(void)
             }
 #endif
 #ifdef HAVE_LCD_BITMAP
-            gui_syncsplash(0, "%s [%d/%d]",
+            splashf(0, "%s [%d/%d]",
                 str(LANG_TAGCACHE_INIT), ret, 
                 tagcache_get_max_commit_step());
 #else
@@ -504,7 +504,7 @@ static void init(void)
     if (button_hold())
 #endif
     {
-        gui_syncsplash(HZ*2, str(LANG_RESET_DONE_CLEAR));
+        splash(HZ*2, str(LANG_RESET_DONE_CLEAR));
         settings_reset();
     }
     else