diff options
author | Kevin Ferrare <kevin@rockbox.org> | 2005-11-16 15:12:15 +0000 |
---|---|---|
committer | Kevin Ferrare <kevin@rockbox.org> | 2005-11-16 15:12:15 +0000 |
commit | e991beed6df8700b41796c4c14ef786f45fb54c5 (patch) | |
tree | 63543693276236f18a91c3de87e2353625eb85dc /apps/playback.c | |
parent | 76b75efa060b55bc7cbf66bae3401af57d907440 (diff) | |
download | rockbox-e991beed6df8700b41796c4c14ef786f45fb54c5.tar.gz rockbox-e991beed6df8700b41796c4c14ef786f45fb54c5.zip |
replaced all the splash calls by gui_sync_splash, added some missing remote key in the playlist viewer
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7909 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/playback.c')
-rw-r--r-- | apps/playback.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/playback.c b/apps/playback.c index 37a86d511c..7f28331b75 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -65,6 +65,7 @@ | |||
65 | #include "radio.h" | 65 | #include "radio.h" |
66 | #include "power.h" | 66 | #include "power.h" |
67 | #endif | 67 | #endif |
68 | #include "splash.h" | ||
68 | 69 | ||
69 | static volatile bool audio_codec_loaded; | 70 | static volatile bool audio_codec_loaded; |
70 | static volatile bool voice_codec_loaded; | 71 | static volatile bool voice_codec_loaded; |
@@ -918,7 +919,7 @@ bool loadcodec(const char *trackname, bool start_play) | |||
918 | default: | 919 | default: |
919 | logf("Codec: Unsupported"); | 920 | logf("Codec: Unsupported"); |
920 | snprintf(msgbuf, sizeof(msgbuf)-1, "No codec for: %s", trackname); | 921 | snprintf(msgbuf, sizeof(msgbuf)-1, "No codec for: %s", trackname); |
921 | splash(HZ*2, true, msgbuf); | 922 | gui_syncsplash(HZ*2, true, msgbuf); |
922 | codec_path = NULL; | 923 | codec_path = NULL; |
923 | } | 924 | } |
924 | 925 | ||
@@ -952,7 +953,7 @@ bool loadcodec(const char *trackname, bool start_play) | |||
952 | if (fd < 0) { | 953 | if (fd < 0) { |
953 | logf("Codec doesn't exist!"); | 954 | logf("Codec doesn't exist!"); |
954 | snprintf(msgbuf, sizeof(msgbuf)-1, "Couldn't load codec: %s", codec_path); | 955 | snprintf(msgbuf, sizeof(msgbuf)-1, "Couldn't load codec: %s", codec_path); |
955 | splash(HZ*2, true, msgbuf); | 956 | gui_syncsplash(HZ*2, true, msgbuf); |
956 | return false; | 957 | return false; |
957 | } | 958 | } |
958 | 959 | ||
@@ -1872,7 +1873,7 @@ void codec_thread(void) | |||
1872 | if (status != CODEC_OK) { | 1873 | if (status != CODEC_OK) { |
1873 | logf("Codec failure"); | 1874 | logf("Codec failure"); |
1874 | audio_stop_playback(); | 1875 | audio_stop_playback(); |
1875 | splash(HZ*2, true, "Codec failure"); | 1876 | gui_syncsplash(HZ*2, true, "Codec failure"); |
1876 | } else { | 1877 | } else { |
1877 | logf("Codec finished"); | 1878 | logf("Codec finished"); |
1878 | } | 1879 | } |
@@ -2266,7 +2267,7 @@ void audio_set_crossfade(int enable) | |||
2266 | 2267 | ||
2267 | /* Re-initialize audio system. */ | 2268 | /* Re-initialize audio system. */ |
2268 | if (was_playing) | 2269 | if (was_playing) |
2269 | splash(0, true, str(LANG_RESTARTING_PLAYBACK)); | 2270 | gui_syncsplash(0, true, str(LANG_RESTARTING_PLAYBACK)); |
2270 | pcmbuf_init(size); | 2271 | pcmbuf_init(size); |
2271 | pcmbuf_crossfade_enable(enable); | 2272 | pcmbuf_crossfade_enable(enable); |
2272 | reset_buffer(); | 2273 | reset_buffer(); |