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/bookmark.c | |
| parent | 9464fdde2d780206e1eddba8cafbfbd4bbff83e4 (diff) | |
| download | rockbox-01729e7a1841d8aae7be37707dbc7146348c9a64.tar.gz 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/bookmark.c')
| -rw-r--r-- | apps/bookmark.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 0c3da641cb..524de5aff4 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c @@ -237,8 +237,8 @@ static bool write_bookmark(bool create_bookmark_file, const char *bookmark) } } - gui_syncsplash(HZ, success ? ID2P(LANG_BOOKMARK_CREATE_SUCCESS) - : ID2P(LANG_BOOKMARK_CREATE_FAILURE)); + splash(HZ, success ? ID2P(LANG_BOOKMARK_CREATE_SUCCESS) + : ID2P(LANG_BOOKMARK_CREATE_FAILURE)); return true; } @@ -400,7 +400,7 @@ bool bookmark_autoload(const char* file) if (!play_bookmark(bookmark)) { /* Selected bookmark not found. */ - gui_syncsplash(HZ*2, ID2P(LANG_NOTHING_TO_RESUME)); + splash(HZ*2, ID2P(LANG_NOTHING_TO_RESUME)); } /* Act as if autoload was done even if it failed, since the @@ -445,7 +445,7 @@ bool bookmark_load(const char* file, bool autoload) /* Selected bookmark not found. */ if (!autoload) { - gui_syncsplash(HZ*2, ID2P(LANG_NOTHING_TO_RESUME)); + splash(HZ*2, ID2P(LANG_NOTHING_TO_RESUME)); } return false; @@ -694,7 +694,7 @@ static char* select_bookmark(const char* bookmark_file_name, bool show_dont_resu if (bookmarks->total_count < 1) { /* No more bookmarks, delete file and exit */ - gui_syncsplash(HZ, ID2P(LANG_BOOKMARK_LOAD_EMPTY)); + splash(HZ, ID2P(LANG_BOOKMARK_LOAD_EMPTY)); remove(bookmark_file_name); return NULL; } |