summaryrefslogtreecommitdiff
path: root/apps/codecs/sid.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-02-20 15:27:10 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-02-20 15:27:10 +0000
commit85e40257dc65e3542b785898ddf60482e2d1ab0c (patch)
treef7bf9b33decce4296fbea0f437252f40aba6d5de /apps/codecs/sid.c
parent460d54977ae2f9c2c5997c6c4cd5541ab436d718 (diff)
downloadrockbox-85e40257dc65e3542b785898ddf60482e2d1ab0c.tar.gz
rockbox-85e40257dc65e3542b785898ddf60482e2d1ab0c.zip
Enforce that codecs wait for their metadata in a proper-ish and consistent manner. Sort of a halfway patch; best would be to give them an internal copy of the current track information which lasts unaltered by playback until a track switch or unload.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29348 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/sid.c')
-rw-r--r--apps/codecs/sid.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/codecs/sid.c b/apps/codecs/sid.c
index 455bdbc28a..52c1289fff 100644
--- a/apps/codecs/sid.c
+++ b/apps/codecs/sid.c
@@ -1220,8 +1220,8 @@ next_track:
1220 return CODEC_ERROR; 1220 return CODEC_ERROR;
1221 } 1221 }
1222 1222
1223 while (!*ci->taginfo_ready && !ci->stop_codec) 1223 if (codec_wait_taginfo() != 0)
1224 ci->sleep(1); 1224 goto request_next_track;
1225 1225
1226 codec_set_replaygain(ci->id3); 1226 codec_set_replaygain(ci->id3);
1227 1227
@@ -1306,6 +1306,7 @@ next_track:
1306 ci->pcmbuf_insert(samples, NULL, CHUNK_SIZE); 1306 ci->pcmbuf_insert(samples, NULL, CHUNK_SIZE);
1307 } 1307 }
1308 1308
1309request_next_track:
1309 if (ci->request_next_track()) 1310 if (ci->request_next_track())
1310 goto next_track; 1311 goto next_track;
1311 1312