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/raac.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/codecs/raac.c') diff --git a/apps/codecs/raac.c b/apps/codecs/raac.c index 3fcdca24c9..22d4b4b8b5 100644 --- a/apps/codecs/raac.c +++ b/apps/codecs/raac.c @@ -56,7 +56,7 @@ enum codec_status codec_main(void) uint32_t s = 0; /* sample rate */ unsigned char c = 0; /* channels */ 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); @@ -70,8 +70,10 @@ next_track: return CODEC_ERROR; } - while (!*ci->taginfo_ready && !ci->stop_codec) - ci->sleep(1); + if (codec_wait_taginfo() != 0) + goto done; + + resume_offset = ci->id3->offset; ci->memset(&rmctx,0,sizeof(RMContext)); ci->memset(&pkt,0,sizeof(RMPacket)); @@ -224,8 +226,6 @@ seek_start: ci->advance_buffer(pkt.length); } - err = CODEC_OK; - done: if (ci->request_next_track()) goto next_track; -- cgit v1.2.3