summaryrefslogtreecommitdiff
path: root/apps/codecs/aac.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/aac.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/aac.c')
-rw-r--r--apps/codecs/aac.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/apps/codecs/aac.c b/apps/codecs/aac.c
index 34239864d1..309c05da38 100644
--- a/apps/codecs/aac.c
+++ b/apps/codecs/aac.c
@@ -78,8 +78,8 @@ next_track:
78 goto exit; 78 goto exit;
79 } 79 }
80 80
81 while (!*ci->taginfo_ready && !ci->stop_codec) 81 if (codec_wait_taginfo() != 0)
82 ci->sleep(1); 82 goto done;
83 83
84 file_offset = ci->id3->offset; 84 file_offset = ci->id3->offset;
85 85
@@ -304,8 +304,6 @@ next_track:
304 i++; 304 i++;
305 } 305 }
306 306
307 err = CODEC_OK;
308
309done: 307done:
310 LOGF("AAC: Decoded %lu samples\n", (unsigned long)sound_samples_done); 308 LOGF("AAC: Decoded %lu samples\n", (unsigned long)sound_samples_done);
311 309