diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2011-02-20 15:27:10 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2011-02-20 15:27:10 +0000 |
commit | 85e40257dc65e3542b785898ddf60482e2d1ab0c (patch) | |
tree | f7bf9b33decce4296fbea0f437252f40aba6d5de /apps/codecs/adx.c | |
parent | 460d54977ae2f9c2c5997c6c4cd5541ab436d718 (diff) | |
download | rockbox-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/adx.c')
-rw-r--r-- | apps/codecs/adx.c | 5 |
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: | |||
78 | ch1_1=ch1_2=ch2_1=ch2_2=0; | 78 | ch1_1=ch1_2=ch2_1=ch2_2=0; |
79 | 79 | ||
80 | /* wait for track info to load */ | 80 | /* wait for track info to load */ |
81 | while (!*ci->taginfo_ready && !ci->stop_codec) | 81 | if (codec_wait_taginfo() != 0) |
82 | ci->sleep(1); | 82 | goto request_next_track; |
83 | 83 | ||
84 | codec_set_replaygain(ci->id3); | 84 | codec_set_replaygain(ci->id3); |
85 | 85 | ||
@@ -385,6 +385,7 @@ next_track: | |||
385 | 1000LL/avgbytespersec); | 385 | 1000LL/avgbytespersec); |
386 | } | 386 | } |
387 | 387 | ||
388 | request_next_track: | ||
388 | if (ci->request_next_track()) | 389 | if (ci->request_next_track()) |
389 | goto next_track; | 390 | goto next_track; |
390 | 391 | ||