summaryrefslogtreecommitdiffstats
path: root/apps/codecs/adx.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/adx.c
parent460d54977ae2f9c2c5997c6c4cd5541ab436d718 (diff)
downloadrockbox-85e40257dc65e3542b785898ddf60482e2d1ab0c.tar.gz
rockbox-85e40257dc65e3542b785898ddf60482e2d1ab0c.tar.bz2
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/adx.c')
-rw-r--r--apps/codecs/adx.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/codecs/adx.c b/apps/codecs/adx.c
index 2ef2091a66..832b94797b 100644
--- a/apps/codecs/adx.c
+++ b/apps/codecs/adx.c
@@ -78,8 +78,8 @@ next_track:
ch1_1=ch1_2=ch2_1=ch2_2=0;
/* wait for track info to load */
- while (!*ci->taginfo_ready && !ci->stop_codec)
- ci->sleep(1);
+ if (codec_wait_taginfo() != 0)
+ goto request_next_track;
codec_set_replaygain(ci->id3);
@@ -385,6 +385,7 @@ next_track:
1000LL/avgbytespersec);
}
+request_next_track:
if (ci->request_next_track())
goto next_track;