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/mpc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'apps/codecs/mpc.c') diff --git a/apps/codecs/mpc.c b/apps/codecs/mpc.c index 1d83449838..187c37e597 100644 --- a/apps/codecs/mpc.c +++ b/apps/codecs/mpc.c @@ -64,7 +64,7 @@ enum codec_status codec_main(void) mpc_streaminfo info; mpc_frame_info frame; mpc_demux *demux = NULL; - int retval = CODEC_OK; + int retval; frame.buffer = sample_buffer; @@ -78,15 +78,17 @@ enum codec_status codec_main(void) reader.tell = tell_impl; reader.get_size = get_size_impl; -next_track: +next_track: + retval = CODEC_OK; + if (codec_init()) { retval = CODEC_ERROR; goto exit; } - while (!*ci->taginfo_ready && !ci->stop_codec) - ci->sleep(1); + if (codec_wait_taginfo() != 0) + goto done; /* Initialize demux/decoder. */ demux = mpc_demux_init(&reader); -- cgit v1.2.3