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/raac.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/raac.c')
-rw-r--r-- | apps/codecs/raac.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/codecs/raac.c b/apps/codecs/raac.c index 3fcdca24c9..22d4b4b8b5 100644 --- a/apps/codecs/raac.c +++ b/apps/codecs/raac.c | |||
@@ -56,7 +56,7 @@ enum codec_status codec_main(void) | |||
56 | uint32_t s = 0; /* sample rate */ | 56 | uint32_t s = 0; /* sample rate */ |
57 | unsigned char c = 0; /* channels */ | 57 | unsigned char c = 0; /* channels */ |
58 | int playback_on = -1; | 58 | int playback_on = -1; |
59 | size_t resume_offset = ci->id3->offset; | 59 | size_t resume_offset; |
60 | 60 | ||
61 | /* Generic codec initialisation */ | 61 | /* Generic codec initialisation */ |
62 | ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED); | 62 | ci->configure(DSP_SET_STEREO_MODE, STEREO_NONINTERLEAVED); |
@@ -70,8 +70,10 @@ next_track: | |||
70 | return CODEC_ERROR; | 70 | return CODEC_ERROR; |
71 | } | 71 | } |
72 | 72 | ||
73 | while (!*ci->taginfo_ready && !ci->stop_codec) | 73 | if (codec_wait_taginfo() != 0) |
74 | ci->sleep(1); | 74 | goto done; |
75 | |||
76 | resume_offset = ci->id3->offset; | ||
75 | 77 | ||
76 | ci->memset(&rmctx,0,sizeof(RMContext)); | 78 | ci->memset(&rmctx,0,sizeof(RMContext)); |
77 | ci->memset(&pkt,0,sizeof(RMPacket)); | 79 | ci->memset(&pkt,0,sizeof(RMPacket)); |
@@ -224,8 +226,6 @@ seek_start: | |||
224 | ci->advance_buffer(pkt.length); | 226 | ci->advance_buffer(pkt.length); |
225 | } | 227 | } |
226 | 228 | ||
227 | err = CODEC_OK; | ||
228 | |||
229 | done: | 229 | done: |
230 | if (ci->request_next_track()) | 230 | if (ci->request_next_track()) |
231 | goto next_track; | 231 | goto next_track; |