summaryrefslogtreecommitdiff
path: root/apps/codecs/cook.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/cook.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/cook.c')
-rw-r--r--apps/codecs/cook.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/codecs/cook.c b/apps/codecs/cook.c
index 7e77c33e1d..015618986c 100644
--- a/apps/codecs/cook.c
+++ b/apps/codecs/cook.c
@@ -47,15 +47,18 @@ enum codec_status codec_main(void)
47 uint16_t fs,sps,h; 47 uint16_t fs,sps,h;
48 uint32_t packet_count; 48 uint32_t packet_count;
49 int scrambling_unit_size, num_units; 49 int scrambling_unit_size, num_units;
50 size_t resume_offset = ci->id3->offset; 50 size_t resume_offset;
51 51
52next_track: 52next_track:
53 if (codec_init()) { 53 if (codec_init()) {
54 DEBUGF("codec init failed\n"); 54 DEBUGF("codec init failed\n");
55 return CODEC_ERROR; 55 return CODEC_ERROR;
56 } 56 }
57 while (!*ci->taginfo_ready && !ci->stop_codec) 57
58 ci->sleep(1); 58 if (codec_wait_taginfo() != 0)
59 goto done;
60
61 resume_offset = ci->id3->offset;
59 62
60 codec_set_replaygain(ci->id3); 63 codec_set_replaygain(ci->id3);
61 ci->memset(&rmctx,0,sizeof(RMContext)); 64 ci->memset(&rmctx,0,sizeof(RMContext));