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/ape.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/ape.c')
-rw-r--r-- | apps/codecs/ape.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/apps/codecs/ape.c b/apps/codecs/ape.c index 06e8842d01..11d973ab26 100644 --- a/apps/codecs/ape.c +++ b/apps/codecs/ape.c | |||
@@ -149,22 +149,21 @@ enum codec_status codec_main(void) | |||
149 | /* Generic codec initialisation */ | 149 | /* Generic codec initialisation */ |
150 | ci->configure(DSP_SET_SAMPLE_DEPTH, APE_OUTPUT_DEPTH-1); | 150 | ci->configure(DSP_SET_SAMPLE_DEPTH, APE_OUTPUT_DEPTH-1); |
151 | 151 | ||
152 | next_track: | 152 | next_track: |
153 | |||
154 | retval = CODEC_OK; | 153 | retval = CODEC_OK; |
155 | 154 | ||
156 | /* Remember the resume position - when the codec is opened, the | ||
157 | playback engine will reset it. */ | ||
158 | resume_offset = ci->id3->offset; | ||
159 | |||
160 | if (codec_init()) { | 155 | if (codec_init()) { |
161 | LOGF("APE: Error initialising codec\n"); | 156 | LOGF("APE: Error initialising codec\n"); |
162 | retval = CODEC_ERROR; | 157 | retval = CODEC_ERROR; |
163 | goto exit; | 158 | goto exit; |
164 | } | 159 | } |
165 | 160 | ||
166 | while (!*ci->taginfo_ready && !ci->stop_codec) | 161 | if (codec_wait_taginfo() != 0) |
167 | ci->sleep(1); | 162 | goto done; |
163 | |||
164 | /* Remember the resume position - when the codec is opened, the | ||
165 | playback engine will reset it. */ | ||
166 | resume_offset = ci->id3->offset; | ||
168 | 167 | ||
169 | inbuffer = ci->request_buffer(&bytesleft, INPUT_CHUNKSIZE); | 168 | inbuffer = ci->request_buffer(&bytesleft, INPUT_CHUNKSIZE); |
170 | 169 | ||
@@ -319,8 +318,6 @@ frame_start: | |||
319 | currentframe++; | 318 | currentframe++; |
320 | } | 319 | } |
321 | 320 | ||
322 | retval = CODEC_OK; | ||
323 | |||
324 | done: | 321 | done: |
325 | LOGF("APE: Decoded %lu samples\n",(unsigned long)samplesdone); | 322 | LOGF("APE: Decoded %lu samples\n",(unsigned long)samplesdone); |
326 | 323 | ||