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/plugins/rockpaint.c | |
parent | 9464fdde2d780206e1eddba8cafbfbd4bbff83e4 (diff) |
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/plugins/rockpaint.c')
-rw-r--r-- | apps/plugins/rockpaint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index c4e6328923..6436d9baa5 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -2520,12 +2520,12 @@ static void goto_menu(void) { if( load_bitmap( filename ) <= 0 ) { - rb->splash( 1*HZ, "Error while loading %s", + rb->splashf( 1*HZ, "Error while loading %s", filename ); } else { - rb->splash( 1*HZ, "Image loaded (%s)", filename ); + rb->splashf( 1*HZ, "Image loaded (%s)", filename ); restore_screen(); inv_cursor(true); return; @@ -2542,7 +2542,7 @@ static void goto_menu(void) rb->strcasecmp(&filename[rb->strlen(filename)-4], ".bmp")) rb->strcat(filename, ".bmp"); save_bitmap( filename ); - rb->splash( 1*HZ, "File saved (%s)", filename ); + rb->splashf( 1*HZ, "File saved (%s)", filename ); } break; @@ -3011,7 +3011,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame } else { - rb->splash( 1*HZ, "Image loaded (%s)", (char *)parameter ); + rb->splashf( 1*HZ, "Image loaded (%s)", (char *)parameter ); restore_screen(); rb->strcpy( filename, parameter ); } |