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/a52_rm.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/a52_rm.c')
-rw-r--r-- | apps/codecs/a52_rm.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/apps/codecs/a52_rm.c b/apps/codecs/a52_rm.c index bc6c129ad2..f5e4923292 100644 --- a/apps/codecs/a52_rm.c +++ b/apps/codecs/a52_rm.c | |||
@@ -132,20 +132,24 @@ enum codec_status codec_main(void) | |||
132 | uint8_t *filebuf; | 132 | uint8_t *filebuf; |
133 | int retval, consumed, packet_offset; | 133 | int retval, consumed, packet_offset; |
134 | int playback_on = -1; | 134 | int playback_on = -1; |
135 | size_t resume_offset = ci->id3->offset; | 135 | size_t resume_offset; |
136 | 136 | ||
137 | /* Generic codec initialisation */ | 137 | /* Generic codec initialisation */ |
138 | ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED); | 138 | ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED); |
139 | ci->configure(DSP_SET_SAMPLE_DEPTH, 28); | 139 | ci->configure(DSP_SET_SAMPLE_DEPTH, 28); |
140 | 140 | ||
141 | next_track: | 141 | next_track: |
142 | retval = CODEC_OK; | ||
143 | |||
142 | if (codec_init()) { | 144 | if (codec_init()) { |
143 | retval = CODEC_ERROR; | 145 | retval = CODEC_ERROR; |
144 | goto exit; | 146 | goto exit; |
145 | } | 147 | } |
146 | 148 | ||
147 | while (!ci->taginfo_ready) | 149 | if (codec_wait_taginfo() != 0) |
148 | ci->yield(); | 150 | goto request_next_track; |
151 | |||
152 | resume_offset = ci->id3->offset; | ||
149 | 153 | ||
150 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); | 154 | ci->configure(DSP_SWITCH_FREQUENCY, ci->id3->frequency); |
151 | codec_set_replaygain(ci->id3); | 155 | codec_set_replaygain(ci->id3); |
@@ -201,8 +205,7 @@ next_track: | |||
201 | ci->advance_buffer(pkt.length); | 205 | ci->advance_buffer(pkt.length); |
202 | } | 206 | } |
203 | 207 | ||
204 | retval = CODEC_OK; | 208 | request_next_track: |
205 | |||
206 | if (ci->request_next_track()) | 209 | if (ci->request_next_track()) |
207 | goto next_track; | 210 | goto next_track; |
208 | 211 | ||