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/tree.c | |
| parent | 9464fdde2d780206e1eddba8cafbfbd4bbff83e4 (diff) | |
| download | rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.zip rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.gz rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.bz2 rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.xz | |
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/tree.c')
| -rw-r--r-- | apps/tree.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/tree.c b/apps/tree.c index 19a0a22..98cb88f 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -276,10 +276,10 @@ bool check_rockboxdir(void) int i; FOR_NB_SCREENS(i) screens[i].clear_display(); - gui_syncsplash(HZ*2, "No .rockbox directory"); + splash(HZ*2, "No .rockbox directory"); FOR_NB_SCREENS(i) screens[i].clear_display(); - gui_syncsplash(HZ*2, "Installation incomplete"); + splash(HZ*2, "Installation incomplete"); return false; } return true; @@ -394,7 +394,7 @@ static int update_dir(void) #endif (tc.dirfull || tc.filesindir == global_settings.max_files_in_dir) ) { - gui_syncsplash(HZ, ID2P(LANG_SHOWDIR_BUFFER_FULL)); + splash(HZ, ID2P(LANG_SHOWDIR_BUFFER_FULL)); } } #ifdef HAVE_TAGCACHE @@ -635,7 +635,7 @@ static int dirbrowse() if (*tc.dirfilter > NUM_FILTER_MODES && numentries==0) { - gui_syncsplash(HZ*2, ID2P(LANG_NO_FILES)); + splash(HZ*2, ID2P(LANG_NO_FILES)); return GO_TO_PREVIOUS; /* No files found for rockbox_browser() */ } @@ -889,7 +889,7 @@ bool create_playlist(void) snprintf(filename, sizeof filename, "%s.m3u8", tc.currdir[1] ? tc.currdir : "/root"); - gui_syncsplash(0, "%s %s", str(LANG_CREATING), filename); + splashf(0, "%s %s", str(LANG_CREATING), filename); trigger_cpu_boost(); catalog_add_to_a_playlist(tc.currdir, ATTR_DIRECTORY, true, filename); @@ -1134,7 +1134,7 @@ void tree_restore(void) if (global_settings.dircache) { /* Print "Scanning disk..." to the display. */ - gui_syncsplash(0, str(LANG_SCANNING_DISK)); + splash(0, str(LANG_SCANNING_DISK)); dircache_build(global_status.dircache_size); } |