1
0
Fork 0
forked from len0rd/rockbox

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
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

View file

@ -690,7 +690,7 @@ static int save(
if (close_stat != 0)
{
rb->splash(0, "failed closing file1: error %d", close_stat);
rb->splashf(0, "failed closing file1: error %d", close_stat);
rb->button_get(true);
rb->button_get(true);
} else {
@ -702,7 +702,7 @@ static int save(
}
else
{
rb->splash(0, "Can't write File1: error %d", file1);
rb->splashf(0, "Can't write File1: error %d", file1);
rb->button_get(true);
rb->button_get(true);
retval = -1;
@ -713,7 +713,7 @@ static int save(
{
if (rb->lseek(src_file, end, SEEK_SET) < (off_t)end)
{
rb->splash(0, "Src file to short: error %d", src_file);
rb->splashf(0, "Src file to short: error %d", src_file);
rb->button_get(true);
rb->button_get(true);
}
@ -731,7 +731,7 @@ static int save(
if (close_stat != 0)
{
rb->splash(0, "failed: closing file2: error %d",
rb->splashf(0, "failed: closing file2: error %d",
close_stat);
rb->button_get(true);
rb->button_get(true);
@ -744,7 +744,7 @@ static int save(
}
else
{
rb->splash(0, "Can't write File2: error %d", file2);
rb->splashf(0, "Can't write File2: error %d", file2);
rb->button_get(true);
rb->button_get(true);
retval = -2;
@ -754,7 +754,7 @@ static int save(
close_stat = rb->close(src_file);
if (close_stat != 0)
{
rb->splash(0, "failed: closing src: error %d", close_stat);
rb->splashf(0, "failed: closing src: error %d", close_stat);
rb->button_get(true);
rb->button_get(true);
}