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_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/atrac3_rm.c')
-rw-r--r-- | apps/codecs/atrac3_rm.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/codecs/atrac3_rm.c b/apps/codecs/atrac3_rm.c index 6c559ec868..6a77d24283 100644 --- a/apps/codecs/atrac3_rm.c +++ b/apps/codecs/atrac3_rm.c | |||
@@ -51,15 +51,18 @@ enum codec_status codec_main(void) | |||
51 | uint32_t packet_count; | 51 | uint32_t packet_count; |
52 | int scrambling_unit_size, num_units, elapsed = 0; | 52 | int scrambling_unit_size, num_units, elapsed = 0; |
53 | int playback_on = -1; | 53 | int playback_on = -1; |
54 | size_t resume_offset = ci->id3->offset; | 54 | size_t resume_offset; |
55 | 55 | ||
56 | next_track: | 56 | next_track: |
57 | if (codec_init()) { | 57 | if (codec_init()) { |
58 | DEBUGF("codec init failed\n"); | 58 | DEBUGF("codec init failed\n"); |
59 | return CODEC_ERROR; | 59 | return CODEC_ERROR; |
60 | } | 60 | } |
61 | while (!*ci->taginfo_ready && !ci->stop_codec) | 61 | |
62 | ci->sleep(1); | 62 | if (codec_wait_taginfo() != 0) |
63 | goto done; | ||
64 | |||
65 | resume_offset = ci->id3->offset; | ||
63 | 66 | ||
64 | codec_set_replaygain(ci->id3); | 67 | codec_set_replaygain(ci->id3); |
65 | ci->memset(&rmctx,0,sizeof(RMContext)); | 68 | ci->memset(&rmctx,0,sizeof(RMContext)); |