From 01729e7a1841d8aae7be37707dbc7146348c9a64 Mon Sep 17 00:00:00 2001 From: Nils Wallménius 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/plugins/wavplay.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'apps/plugins/wavplay.c') diff --git a/apps/plugins/wavplay.c b/apps/plugins/wavplay.c index 0a1136a6c2..333d16135c 100644 --- a/apps/plugins/wavplay.c +++ b/apps/plugins/wavplay.c @@ -3500,7 +3500,7 @@ int play_file(char* filename) format = letoh16(*(uint16_t *)(aud_buf + 20)); if (format != 1) { - rb->splash(2*HZ, "Unsupported format: %d", format); + rb->splashf(2*HZ, "Unsupported format: %d", format); rb->close(fd); return PLAY_ERROR; } @@ -3508,7 +3508,7 @@ int play_file(char* filename) channels = letoh16(*(uint16_t *)(aud_buf + 22)); if (channels > 2) { - rb->splash(2*HZ, "Too many channels: %d", channels); + rb->splashf(2*HZ, "Too many channels: %d", channels); rb->close(fd); return PLAY_ERROR; } @@ -3516,7 +3516,7 @@ int play_file(char* filename) samplebits = letoh16(*(uint16_t *)(aud_buf + 34)); if (samplebits != 16) { - rb->splash(2*HZ, "Unsupported sample depth: %dbit", samplebits); + rb->splashf(2*HZ, "Unsupported sample depth: %dbit", samplebits); rb->close(fd); return PLAY_ERROR; } @@ -3534,7 +3534,7 @@ int play_file(char* filename) case 44100: rate = 9; break; case 48000: rate = 10; break; default: - rb->splash(2*HZ, "Unsupported samplerate: %dHz", samplerate); + rb->splashf(2*HZ, "Unsupported samplerate: %dHz", samplerate); rb->close(fd); return PLAY_ERROR; } -- cgit v1.2.3