devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

FS#9281 Rename of splash functions.

Browse source 
* 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
This commit is contained in:
Nils Wallménius 2008-08-15 08:27:39 +00:00
parent 9464fdde2d
commit 01729e7a18
65 changed files with 276 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/plugins/shortcuts/shortcuts_common.c
View file

@ -90,7 +90,7 @@ bool load_sc_file(sc_file_t *file, char *filename, bool must_exist,
if (fd < 0){
/* For some reason we couldn't create the file,
* so return an error message and exit */
rb->splash(HZ*2, "Couldn't create the shortcuts file %s",
rb->splashf(HZ*2, "Couldn't create the shortcuts file %s",
filename);
goto end_of_proc;
}
@ -98,7 +98,7 @@ bool load_sc_file(sc_file_t *file, char *filename, bool must_exist,
ret_val = true;
goto end_of_proc;
} else {
rb->splash(HZ, "Couldn't open %s", filename);
rb->splashf(HZ, "Couldn't open %s", filename);
goto end_of_proc;
}
}
@ -108,7 +108,7 @@ bool load_sc_file(sc_file_t *file, char *filename, bool must_exist,
continue;
}
if (file->entry_cnt >= file->max_entries) {
rb->splash(HZ*2, "Too many entries in the file, max allowed: %d",
rb->splashf(HZ*2, "Too many entries in the file, max allowed: %d",
file->max_entries);
goto end_of_proc;
}
@ -320,7 +320,7 @@ bool dump_sc_file(sc_file_t *file, char *filename)
* thing. */
fd = rb->open(filename, O_WRONLY|O_TRUNC);
if (fd < 0) {
rb->splash(HZ*2, "Could not open shortcuts file %s for writing",
rb->splashf(HZ*2, "Could not open shortcuts file %s for writing",
filename);
return false;
}