summaryrefslogtreecommitdiff
path: root/apps/codecs/shorten.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/shorten.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/shorten.c')
-rw-r--r--apps/codecs/shorten.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/codecs/shorten.c b/apps/codecs/shorten.c
index 7595ca30c7..83a9c34da8 100644
--- a/apps/codecs/shorten.c
+++ b/apps/codecs/shorten.c
@@ -57,8 +57,8 @@ next_track:
57 return CODEC_ERROR; 57 return CODEC_ERROR;
58 } 58 }
59 59
60 while (!*ci->taginfo_ready) 60 if (codec_wait_taginfo() != 0)
61 ci->yield(); 61 goto request_next_track;
62 62
63 codec_set_replaygain(ci->id3); 63 codec_set_replaygain(ci->id3);
64 64
@@ -153,6 +153,7 @@ seek_start:
153 sc.bitindex = sc.gb.index - 8*consumed; 153 sc.bitindex = sc.gb.index - 8*consumed;
154 } 154 }
155 155
156request_next_track:
156 if (ci->request_next_track()) 157 if (ci->request_next_track())
157 goto next_track; 158 goto next_track;
158 159