summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@rockbox.org>2006-04-08 13:06:28 +0000
committerBrandon Low <lostlogic@rockbox.org>2006-04-08 13:06:28 +0000
commit3e3c21b6f0bc1c9b94de402282364ea6e61d9cea (patch)
treebc0f7ec8ad355378823044b4df25c93861158d6a
parent502fbd710cc312dc54c6a9d236a1c1de80b62387 (diff)
downloadrockbox-3e3c21b6f0bc1c9b94de402282364ea6e61d9cea.tar.gz
rockbox-3e3c21b6f0bc1c9b94de402282364ea6e61d9cea.zip
Fix the condition on an error splash
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9565 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playback.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/playback.c b/apps/playback.c
index e82930097b..7889f120f7 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1211,9 +1211,6 @@ static bool audio_load_track(int offset, bool start_play, int peek_offset)
1211 /* Load the codec. */ 1211 /* Load the codec. */
1212 tracks[track_widx].codecbuf = &filebuf[buf_widx]; 1212 tracks[track_widx].codecbuf = &filebuf[buf_widx];
1213 if (!loadcodec(start_play)) { 1213 if (!loadcodec(start_play)) {
1214 /* We should not use gui_syncplash from audio thread! */
1215 snprintf(msgbuf, sizeof(msgbuf)-1, "No codec for: %s", trackname);
1216 gui_syncsplash(HZ*2, true, msgbuf);
1217 close(current_fd); 1214 close(current_fd);
1218 current_fd = -1; 1215 current_fd = -1;
1219 1216
@@ -1224,6 +1221,10 @@ static bool audio_load_track(int offset, bool start_play, int peek_offset)
1224 1221
1225 /* Try skipping to next track if there is space. */ 1222 /* Try skipping to next track if there is space. */
1226 if (fill_bytesleft > 0) { 1223 if (fill_bytesleft > 0) {
1224 /* This is an error condition unless the fill_bytesleft is 0 */
1225 snprintf(msgbuf, sizeof(msgbuf)-1, "No codec for: %s", trackname);
1226 /* We should not use gui_syncplash from audio thread! */
1227 gui_syncsplash(HZ*2, true, msgbuf);
1227 /* Skip invalid entry from playlist. */ 1228 /* Skip invalid entry from playlist. */
1228 playlist_skip_entry(NULL, peek_offset); 1229 playlist_skip_entry(NULL, peek_offset);
1229 goto peek_again; 1230 goto peek_again;