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/aiff.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/aiff.c')
-rw-r--r-- | apps/codecs/aiff.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/codecs/aiff.c b/apps/codecs/aiff.c index 4a127c7e0e..d4cf8660dd 100644 --- a/apps/codecs/aiff.c +++ b/apps/codecs/aiff.c | |||
@@ -63,7 +63,7 @@ static const struct pcm_codec *get_codec(uint32_t formattag) | |||
63 | 63 | ||
64 | enum codec_status codec_main(void) | 64 | enum codec_status codec_main(void) |
65 | { | 65 | { |
66 | int status = CODEC_OK; | 66 | int status; |
67 | struct pcm_format format; | 67 | struct pcm_format format; |
68 | uint32_t bytesdone, decodedsamples; | 68 | uint32_t bytesdone, decodedsamples; |
69 | uint32_t num_sample_frames = 0; | 69 | uint32_t num_sample_frames = 0; |
@@ -82,13 +82,15 @@ enum codec_status codec_main(void) | |||
82 | ci->configure(DSP_SET_SAMPLE_DEPTH, PCM_OUTPUT_DEPTH-1); | 82 | ci->configure(DSP_SET_SAMPLE_DEPTH, PCM_OUTPUT_DEPTH-1); |
83 | 83 | ||
84 | next_track: | 84 | next_track: |
85 | status = CODEC_OK; | ||
86 | |||
85 | if (codec_init()) { | 87 | if (codec_init()) { |
86 | status = CODEC_ERROR; | 88 | status = CODEC_ERROR; |
87 | goto exit; | 89 | goto exit; |
88 | } | 90 | } |
89 | 91 | ||
90 | while (!*ci->taginfo_ready && !ci->stop_codec) | 92 | if (codec_wait_taginfo() != 0) |
91 | ci->sleep(1); | 93 | goto done; |
92 | 94 | ||
93 | codec_set_replaygain(ci->id3); | 95 | codec_set_replaygain(ci->id3); |
94 | 96 | ||