summaryrefslogtreecommitdiff
path: root/apps/codecs/au.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/au.c
parent460d54977ae2f9c2c5997c6c4cd5541ab436d718 (diff)
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/au.c')
-rw-r--r--apps/codecs/au.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/codecs/au.c b/apps/codecs/au.c
index 1e6af25924..3f9436c9e7 100644
--- a/apps/codecs/au.c
+++ b/apps/codecs/au.c
@@ -108,7 +108,7 @@ static int convert_au_format(unsigned int encoding, struct pcm_format *fmt)
/* this is the codec entry point */
enum codec_status codec_main(void)
{
- int status = CODEC_OK;
+ int status;
struct pcm_format format;
uint32_t bytesdone, decodedsamples;
size_t n;
@@ -124,14 +124,16 @@ enum codec_status codec_main(void)
ci->configure(DSP_SET_SAMPLE_DEPTH, PCM_OUTPUT_DEPTH-1);
next_track:
+ status = CODEC_OK;
+
if (codec_init()) {
DEBUGF("codec_init() error\n");
status = CODEC_ERROR;
goto exit;
}
- while (!*ci->taginfo_ready && !ci->stop_codec)
- ci->sleep(1);
+ if (codec_wait_taginfo() != 0)
+ goto done;
codec_set_replaygain(ci->id3);
@@ -304,7 +306,6 @@ next_track:
endofstream = 1;
ci->set_elapsed(decodedsamples*1000LL/ci->id3->frequency);
}
- status = CODEC_OK;
done:
if (ci->request_next_track())