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/filetypes.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps/filetypes.c') diff --git a/apps/filetypes.c b/apps/filetypes.c index b05942f..b50814f 100644 --- a/apps/filetypes.c +++ b/apps/filetypes.c @@ -106,7 +106,7 @@ static const struct filetype inbuilt_filetypes[] = { { "cue", FILE_ATTR_CUE, Icon_Bookmark, VOICE_EXT_CUESHEET }, #ifdef BOOTFILE_EXT { BOOTFILE_EXT, FILE_ATTR_MOD, Icon_Firmware, VOICE_EXT_AJZ }, -#endif /* #ifndef SIMULATOR */ +#endif }; void tree_get_filetypes(const struct filetype** types, int* count) @@ -300,7 +300,7 @@ static void read_config(char* config_file) { if (filetype_count >= MAX_FILETYPES) { - gui_syncsplash(HZ, ID2P(LANG_FILETYPES_FULL)); + splash(HZ, ID2P(LANG_FILETYPES_FULL)); break; } rm_whitespaces(line); @@ -485,7 +485,7 @@ int filetype_list_viewers(const char* current_file) if (count == 0) { /* FIX: translation! */ - gui_syncsplash(HZ*2, (unsigned char *)"No viewers found"); + splash(HZ*2, "No viewers found"); return PLUGIN_OK; } #endif -- cgit v1.1