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/atrac3_oma.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/atrac3_oma.c')
-rw-r--r-- | apps/codecs/atrac3_oma.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/codecs/atrac3_oma.c b/apps/codecs/atrac3_oma.c index 2085466ed5..73f3ad29fd 100644 --- a/apps/codecs/atrac3_oma.c +++ b/apps/codecs/atrac3_oma.c | |||
@@ -40,15 +40,18 @@ enum codec_status codec_main(void) | |||
40 | int datasize, res, frame_counter, total_frames, seek_frame_offset; | 40 | int datasize, res, frame_counter, total_frames, seek_frame_offset; |
41 | uint8_t *bit_buffer; | 41 | uint8_t *bit_buffer; |
42 | int elapsed = 0; | 42 | int elapsed = 0; |
43 | size_t resume_offset = ci->id3->offset; | 43 | size_t resume_offset; |
44 | 44 | ||
45 | next_track: | 45 | next_track: |
46 | if (codec_init()) { | 46 | if (codec_init()) { |
47 | DEBUGF("codec init failed\n"); | 47 | DEBUGF("codec init failed\n"); |
48 | return CODEC_ERROR; | 48 | return CODEC_ERROR; |
49 | } | 49 | } |
50 | while (!*ci->taginfo_ready && !ci->stop_codec) | 50 | |
51 | ci->sleep(1); | 51 | if (codec_wait_taginfo() != 0) |
52 | goto done; | ||
53 | |||
54 | resume_offset = ci->id3->offset; | ||
52 | 55 | ||
53 | codec_set_replaygain(ci->id3); | 56 | codec_set_replaygain(ci->id3); |
54 | ci->memset(&q,0,sizeof(ATRAC3Context)); | 57 | ci->memset(&q,0,sizeof(ATRAC3Context)); |