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/jpeg.c | |
parent | 9464fdde2d780206e1eddba8cafbfbd4bbff83e4 (diff) | |
download | rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.gz 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/plugins/jpeg.c')
-rw-r--r-- | apps/plugins/jpeg.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index a17c6d7729..ffc9d49a98 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -3026,7 +3026,7 @@ struct t_disp* get_image(struct jpeg* p_jpg, int ds) | |||
3026 | #endif | 3026 | #endif |
3027 | if (status) | 3027 | if (status) |
3028 | { | 3028 | { |
3029 | rb->splash(HZ, "decode error %d", status); | 3029 | rb->splashf(HZ, "decode error %d", status); |
3030 | file_pt[curfile] = '\0'; | 3030 | file_pt[curfile] = '\0'; |
3031 | return NULL; | 3031 | return NULL; |
3032 | } | 3032 | } |
@@ -3212,7 +3212,7 @@ int load_and_show(char* filename) | |||
3212 | 3212 | ||
3213 | if (status < 0 || (status & (DQT | SOF0)) != (DQT | SOF0)) | 3213 | if (status < 0 || (status & (DQT | SOF0)) != (DQT | SOF0)) |
3214 | { /* bad format or minimum components not contained */ | 3214 | { /* bad format or minimum components not contained */ |
3215 | rb->splash(HZ, "unsupported %d", status); | 3215 | rb->splashf(HZ, "unsupported %d", status); |
3216 | file_pt[curfile] = '\0'; | 3216 | file_pt[curfile] = '\0'; |
3217 | return change_filename(direction); | 3217 | return change_filename(direction); |
3218 | } | 3218 | } |