summaryrefslogtreecommitdiffstats
path: root/apps/gui/splash.h
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2008-08-15 08:27:39 +0000
committerNils Wallménius <nils@rockbox.org>2008-08-15 08:27:39 +0000
commit01729e7a1841d8aae7be37707dbc7146348c9a64 (patch)
tree5490fd9eccdcaef39bbbb91e8a44d1caad9b2ef7 /apps/gui/splash.h
parent9464fdde2d780206e1eddba8cafbfbd4bbff83e4 (diff)
downloadrockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.gz
rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.bz2
rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.zip
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/gui/splash.h')
-rw-r--r--apps/gui/splash.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/apps/gui/splash.h b/apps/gui/splash.h
index bb3c8727d1..1bbb9e9e49 100644
--- a/apps/gui/splash.h
+++ b/apps/gui/splash.h
@@ -25,20 +25,17 @@
#include "screen_access.h"
/*
- * Puts a splash message centered on the given screen for a given period
- * - screen : the screen to put the splash on
+ * Puts a splash message centered on all the screens for a given period
* - ticks : how long the splash is displayed (in rb ticks)
* - fmt : what to say *printf style
*/
-extern void gui_splash(struct screen * screen, int ticks,
- const char *fmt, ...) ATTRIBUTE_PRINTF(3, 4);
+extern void splashf(int ticks, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3);
/*
* Puts a splash message centered on all the screens for a given period
* - ticks : how long the splash is displayed (in rb ticks)
- * - fmt : what to say *printf style
+ * - str : what to say, if this is a LANG_* string (from ID2P)
+ * it will be voiced
*/
-extern void gui_syncsplash(int ticks, const char *fmt, ...)
- ATTRIBUTE_PRINTF(2, 3);
-
+extern void splash(int ticks, const char *str);
#endif /* _GUI_ICON_H_ */