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/playlist_viewer.c | |
| parent | 9464fdde2d780206e1eddba8cafbfbd4bbff83e4 (diff) | |
| download | rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.gz rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.bz2 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/playlist_viewer.c')
| -rw-r--r-- | apps/playlist_viewer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c index 0d59354804..62e755a53a 100644 --- a/apps/playlist_viewer.c +++ b/apps/playlist_viewer.c @@ -293,7 +293,7 @@ static bool playlist_viewer_init(struct playlist_viewer * viewer, if (!have_list) { /* Nothing to view, exit */ - gui_syncsplash(HZ, str(LANG_CATALOG_NO_PLAYLISTS)); + splash(HZ, str(LANG_CATALOG_NO_PLAYLISTS)); return false; } @@ -680,8 +680,8 @@ bool playlist_viewer_ex(const char* filename) ret_val = playlist_move(viewer.playlist, viewer.move_track, current_track->index); if (ret_val < 0) - gui_syncsplash(HZ, (unsigned char *)"%s %s", - str(LANG_MOVE), str(LANG_FAILED)); + splashf(HZ, (unsigned char *)"%s %s", str(LANG_MOVE), + str(LANG_FAILED)); update_playlist(true); viewer.move_track = -1; } @@ -795,7 +795,7 @@ bool search_playlist(void) playlist_count = playlist_amount_ex(viewer.playlist); for (i=0;(i<playlist_count)&&(found_indicies_count<MAX_PLAYLIST_ENTRIES);i++) { - gui_syncsplash(0, str(LANG_PLAYLIST_SEARCH_MSG),found_indicies_count, + splashf(0, str(LANG_PLAYLIST_SEARCH_MSG), found_indicies_count, str(LANG_OFF_ABORT)); if (action_userabort(TIMEOUT_NOBLOCK)) { |