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/flac.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'apps/codecs/flac.c') diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c index e8b7f9ad83..89d14b98a7 100644 --- a/apps/codecs/flac.c +++ b/apps/codecs/flac.c @@ -433,19 +433,20 @@ enum codec_status codec_main(void) /* Generic codec initialisation */ ci->configure(DSP_SET_SAMPLE_DEPTH, FLAC_OUTPUT_DEPTH-1); - next_track: +next_track: + retval = CODEC_OK; - /* Need to save offset for later use (cleared indirectly by flac_init) */ - samplesdone=ci->id3->offset; - if (codec_init()) { LOGF("FLAC: Error initialising codec\n"); retval = CODEC_ERROR; goto exit; } - while (!*ci->taginfo_ready && !ci->stop_codec) - ci->sleep(1); + if (codec_wait_taginfo() != 0) + goto done; + + /* Need to save offset for later use (cleared indirectly by flac_init) */ + samplesdone = ci->id3->offset; if (!flac_init(&fc,ci->id3->first_frame_offset)) { LOGF("FLAC: Error initialising codec\n"); -- cgit v1.2.3