From 85e40257dc65e3542b785898ddf60482e2d1ab0c Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Sun, 20 Feb 2011 15:27:10 +0000 Subject: 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 --- apps/codecs/a52_rm.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'apps/codecs/a52_rm.c') diff --git a/apps/codecs/a52_rm.c b/apps/codecs/a52_rm.c index bc6c129ad2..f5e4923292 100644 --- a/apps/codecs/a52_rm.c +++ b/apps/codecs/a52_rm.c @@ -132,20 +132,24 @@ enum codec_status codec_main(void) uint8_t *filebuf; int retval, consumed, packet_offset; int playback_on = -1; - size_t resume_offset = ci->id3->offset; + size_t resume_offset; /* Generic codec initialisation */ ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED); ci->configure(DSP_SET_SAMPLE_DEPTH, 28); next_track: + retval = CODEC_OK; + if (codec_init()) { retval = CODEC_ERROR; goto exit; } - while (!ci->taginfo_ready) - ci->yield(); + if (codec_wait_taginfo() != 0) + goto request_next_track; + + resume_offset = ci->id3->offset; ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); codec_set_replaygain(ci->id3); @@ -201,8 +205,7 @@ next_track: ci->advance_buffer(pkt.length); } - retval = CODEC_OK; - +request_next_track: if (ci->request_next_track()) goto next_track; -- cgit v1.2.3