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/action.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/action.c')
| -rw-r--r-- | apps/action.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/action.c b/apps/action.c index 7cde1b14ba..b1dd98df08 100644 --- a/apps/action.c +++ b/apps/action.c @@ -172,7 +172,7 @@ static int get_action_worker(int context, int timeout, { last_button = BUTTON_NONE; keys_locked = false; - gui_syncsplash(HZ/2, str(LANG_KEYLOCK_OFF)); + splash(HZ/2, str(LANG_KEYLOCK_OFF)); return ACTION_REDRAW; } else @@ -181,7 +181,7 @@ static int get_action_worker(int context, int timeout, #endif { if ((button & BUTTON_REL)) - gui_syncsplash(HZ/2, str(LANG_KEYLOCK_ON)); + splash(HZ/2, str(LANG_KEYLOCK_ON)); return ACTION_REDRAW; } } @@ -220,7 +220,7 @@ static int get_action_worker(int context, int timeout, { unlock_combo = button; keys_locked = true; - gui_syncsplash(HZ/2, str(LANG_KEYLOCK_ON)); + splash(HZ/2, str(LANG_KEYLOCK_ON)); button_clear_queue(); return ACTION_REDRAW; |