summaryrefslogtreecommitdiff
path: root/apps/codecs/wav64.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/wav64.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/wav64.c')
-rw-r--r--apps/codecs/wav64.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/codecs/wav64.c b/apps/codecs/wav64.c
index c06f78c802..9dbdab8368 100644
--- a/apps/codecs/wav64.c
+++ b/apps/codecs/wav64.c
@@ -161,7 +161,7 @@ static uint8_t *read_buffer(size_t *realsize)
161/* this is the codec entry point */ 161/* this is the codec entry point */
162enum codec_status codec_main(void) 162enum codec_status codec_main(void)
163{ 163{
164 int status = CODEC_OK; 164 int status;
165 uint32_t decodedsamples; 165 uint32_t decodedsamples;
166 size_t n; 166 size_t n;
167 int bufcount; 167 int bufcount;
@@ -176,14 +176,16 @@ enum codec_status codec_main(void)
176 ci->configure(DSP_SET_SAMPLE_DEPTH, PCM_OUTPUT_DEPTH-1); 176 ci->configure(DSP_SET_SAMPLE_DEPTH, PCM_OUTPUT_DEPTH-1);
177 177
178next_track: 178next_track:
179 status = CODEC_OK;
180
179 if (codec_init()) { 181 if (codec_init()) {
180 DEBUGF("codec_init() error\n"); 182 DEBUGF("codec_init() error\n");
181 status = CODEC_ERROR; 183 status = CODEC_ERROR;
182 goto exit; 184 goto exit;
183 } 185 }
184 186
185 while (!*ci->taginfo_ready && !ci->stop_codec) 187 if (codec_wait_taginfo() != 0)
186 ci->sleep(1); 188 goto done;
187 189
188 codec_set_replaygain(ci->id3); 190 codec_set_replaygain(ci->id3);
189 191