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/wmapro.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'apps/codecs/wmapro.c') diff --git a/apps/codecs/wmapro.c b/apps/codecs/wmapro.c index 75bbd24cda..c02dddeeb3 100644 --- a/apps/codecs/wmapro.c +++ b/apps/codecs/wmapro.c @@ -48,16 +48,18 @@ enum codec_status codec_main(void) next_track: + retval = CODEC_OK; /* Wait for the metadata to be read */ - while (!*ci->taginfo_ready && !ci->stop_codec) - ci->sleep(1); - - retval = CODEC_OK; + if (codec_wait_taginfo() != 0) + goto done; /* Remember the resume position */ resume_offset = ci->id3->offset; - restart_track: + +restart_track: + retval = CODEC_OK; + if (codec_init()) { LOGF("(WMA PRO) Error: Error initialising codec\n"); retval = CODEC_ERROR; @@ -149,7 +151,6 @@ next_track: /* Advance to the next logical packet */ ci->advance_buffer(packetlength); } - retval = CODEC_OK; done: if (ci->request_next_track()) -- cgit v1.2.3