diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2011-02-20 15:27:10 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2011-02-20 15:27:10 +0000 |
| commit | 85e40257dc65e3542b785898ddf60482e2d1ab0c (patch) | |
| tree | f7bf9b33decce4296fbea0f437252f40aba6d5de /apps/codecs/vox.c | |
| parent | 460d54977ae2f9c2c5997c6c4cd5541ab436d718 (diff) | |
| download | rockbox-85e40257dc65e3542b785898ddf60482e2d1ab0c.zip rockbox-85e40257dc65e3542b785898ddf60482e2d1ab0c.tar.gz rockbox-85e40257dc65e3542b785898ddf60482e2d1ab0c.tar.bz2 rockbox-85e40257dc65e3542b785898ddf60482e2d1ab0c.tar.xz | |
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/vox.c')
| -rw-r--r-- | apps/codecs/vox.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/codecs/vox.c b/apps/codecs/vox.c index ff5d571..c7f3934 100644 --- a/apps/codecs/vox.c +++ b/apps/codecs/vox.c @@ -46,7 +46,7 @@ static uint8_t *read_buffer(size_t *realsize) /* this is the codec entry point */ enum codec_status codec_main(void) { - int status = CODEC_OK; + int status; uint32_t decodedsamples; size_t n; int bufcount; @@ -59,14 +59,16 @@ enum codec_status codec_main(void) ci->configure(DSP_SET_SAMPLE_DEPTH, PCM_OUTPUT_DEPTH-1); next_track: + status = CODEC_OK; + if (codec_init()) { DEBUGF("codec_init() error\n"); status = CODEC_ERROR; goto exit; } - while (!*ci->taginfo_ready && !ci->stop_codec) - ci->sleep(1); + if (codec_wait_taginfo() != 0) + goto done; codec_set_replaygain(ci->id3); @@ -189,7 +191,6 @@ next_track: endofstream = 1; ci->set_elapsed(decodedsamples*1000LL/ci->id3->frequency); } - status = CODEC_OK; done: if (ci->request_next_track()) |