summaryrefslogtreecommitdiffstats
path: root/apps/playlist_catalog.c
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2008-08-15 08:27:39 +0000
committerNils Wallménius <nils@rockbox.org>2008-08-15 08:27:39 +0000
commit01729e7a1841d8aae7be37707dbc7146348c9a64 (patch)
tree5490fd9eccdcaef39bbbb91e8a44d1caad9b2ef7 /apps/playlist_catalog.c
parent9464fdde2d780206e1eddba8cafbfbd4bbff83e4 (diff)
downloadrockbox-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_catalog.c')
-rw-r--r--apps/playlist_catalog.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/apps/playlist_catalog.c b/apps/playlist_catalog.c
index cadad9f464..ef2c1d13d5 100644
--- a/apps/playlist_catalog.c
+++ b/apps/playlist_catalog.c
@@ -96,8 +96,7 @@ static int initialize_catalog(void)
if (!playlist_dir_exists)
{
if (mkdir(playlist_dir) < 0) {
- gui_syncsplash(HZ*2, ID2P(LANG_CATALOG_NO_DIRECTORY),
- playlist_dir);
+ splashf(HZ*2, ID2P(LANG_CATALOG_NO_DIRECTORY), playlist_dir);
return -1;
}
else {
@@ -130,8 +129,7 @@ static int create_playlist_list(char** playlists, int num_items,
if (ft_load(tc, playlist_dir) < 0)
{
- gui_syncsplash(HZ*2, ID2P(LANG_CATALOG_NO_DIRECTORY),
- playlist_dir);
+ splashf(HZ*2, ID2P(LANG_CATALOG_NO_DIRECTORY), playlist_dir);
goto exit;
}
@@ -234,7 +232,7 @@ static int display_playlists(char* playlist, bool view)
if (num_playlists <= 0)
{
- gui_syncsplash(HZ*2, ID2P(LANG_CATALOG_NO_PLAYLISTS));
+ splash(HZ*2, ID2P(LANG_CATALOG_NO_PLAYLISTS));
return -1;
}
@@ -327,8 +325,7 @@ static void display_insert_count(int count)
talk_id(LANG_PLAYLIST_INSERT_COUNT, true);
}
- gui_syncsplash(0, str(LANG_PLAYLIST_INSERT_COUNT), count,
- str(LANG_OFF_ABORT));
+ splashf(0, str(LANG_PLAYLIST_INSERT_COUNT), count, str(LANG_OFF_ABORT));
}
/* Add specified track into playlist. Callback from directory insert */