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/flac.c | |
parent | 460d54977ae2f9c2c5997c6c4cd5541ab436d718 (diff) | |
download | rockbox-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/flac.c')
-rw-r--r-- | apps/codecs/flac.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/apps/codecs/flac.c b/apps/codecs/flac.c index e8b7f9ad83..89d14b98a7 100644 --- a/apps/codecs/flac.c +++ b/apps/codecs/flac.c | |||
@@ -433,19 +433,20 @@ enum codec_status codec_main(void) | |||
433 | /* Generic codec initialisation */ | 433 | /* Generic codec initialisation */ |
434 | ci->configure(DSP_SET_SAMPLE_DEPTH, FLAC_OUTPUT_DEPTH-1); | 434 | ci->configure(DSP_SET_SAMPLE_DEPTH, FLAC_OUTPUT_DEPTH-1); |
435 | 435 | ||
436 | next_track: | 436 | next_track: |
437 | retval = CODEC_OK; | ||
437 | 438 | ||
438 | /* Need to save offset for later use (cleared indirectly by flac_init) */ | ||
439 | samplesdone=ci->id3->offset; | ||
440 | |||
441 | if (codec_init()) { | 439 | if (codec_init()) { |
442 | LOGF("FLAC: Error initialising codec\n"); | 440 | LOGF("FLAC: Error initialising codec\n"); |
443 | retval = CODEC_ERROR; | 441 | retval = CODEC_ERROR; |
444 | goto exit; | 442 | goto exit; |
445 | } | 443 | } |
446 | 444 | ||
447 | while (!*ci->taginfo_ready && !ci->stop_codec) | 445 | if (codec_wait_taginfo() != 0) |
448 | ci->sleep(1); | 446 | goto done; |
447 | |||
448 | /* Need to save offset for later use (cleared indirectly by flac_init) */ | ||
449 | samplesdone = ci->id3->offset; | ||
449 | 450 | ||
450 | if (!flac_init(&fc,ci->id3->first_frame_offset)) { | 451 | if (!flac_init(&fc,ci->id3->first_frame_offset)) { |
451 | LOGF("FLAC: Error initialising codec\n"); | 452 | LOGF("FLAC: Error initialising codec\n"); |