summaryrefslogtreecommitdiff
path: root/apps/codecs/alac.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2011-02-20 15:27:10 +0000
committerMichael Sevakis <jethead71@rockbox.org>2011-02-20 15:27:10 +0000
commit85e40257dc65e3542b785898ddf60482e2d1ab0c (patch)
treef7bf9b33decce4296fbea0f437252f40aba6d5de /apps/codecs/alac.c
parent460d54977ae2f9c2c5997c6c4cd5541ab436d718 (diff)
downloadrockbox-85e40257dc65e3542b785898ddf60482e2d1ab0c.tar.gz
rockbox-85e40257dc65e3542b785898ddf60482e2d1ab0c.zip
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
Diffstat (limited to 'apps/codecs/alac.c')
-rw-r--r--apps/codecs/alac.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/alac.c b/apps/codecs/alac.c
index 003d222f00..3721f04f1f 100644
--- a/apps/codecs/alac.c
+++ b/apps/codecs/alac.c
@@ -48,6 +48,7 @@ enum codec_status codec_main(void)
48 ci->configure(DSP_SET_SAMPLE_DEPTH, ALAC_OUTPUT_DEPTH-1); 48 ci->configure(DSP_SET_SAMPLE_DEPTH, ALAC_OUTPUT_DEPTH-1);
49 49
50 next_track: 50 next_track:
51 retval = CODEC_OK;
51 52
52 /* Clean and initialize decoder structures */ 53 /* Clean and initialize decoder structures */
53 memset(&demux_res , 0, sizeof(demux_res)); 54 memset(&demux_res , 0, sizeof(demux_res));
@@ -57,8 +58,8 @@ enum codec_status codec_main(void)
57 goto exit; 58 goto exit;
58 } 59 }
59 60
60 while (!*ci->taginfo_ready && !ci->stop_codec) 61 if (codec_wait_taginfo() != 0)
61 ci->sleep(1); 62 goto done;
62 63
63 ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); 64 ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency);
64 codec_set_replaygain(ci->id3); 65 codec_set_replaygain(ci->id3);
@@ -145,7 +146,6 @@ enum codec_status codec_main(void)
145 146
146 i++; 147 i++;
147 } 148 }
148 retval = CODEC_OK;
149 149
150done: 150done:
151 LOGF("ALAC: Decoded %lu samples\n",(unsigned long)samplesdone); 151 LOGF("ALAC: Decoded %lu samples\n",(unsigned long)samplesdone);