summaryrefslogtreecommitdiff
path: root/apps/codecs/mod.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/mod.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/mod.c')
-rw-r--r--apps/codecs/mod.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/codecs/mod.c b/apps/codecs/mod.c
index 3e2e4284de..4ace721a1e 100644
--- a/apps/codecs/mod.c
+++ b/apps/codecs/mod.c
@@ -1232,8 +1232,8 @@ next_track:
1232 return CODEC_ERROR; 1232 return CODEC_ERROR;
1233 } 1233 }
1234 1234
1235 while (!*ci->taginfo_ready && !ci->stop_codec) 1235 if (codec_wait_taginfo() != 0)
1236 ci->sleep(1); 1236 goto request_next_track;
1237 1237
1238 codec_set_replaygain(ci->id3); 1238 codec_set_replaygain(ci->id3);
1239 1239
@@ -1305,6 +1305,7 @@ next_track:
1305 1305
1306 } 1306 }
1307 1307
1308request_next_track:
1308 if (ci->request_next_track()) 1309 if (ci->request_next_track())
1309 goto next_track; 1310 goto next_track;
1310 1311