summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2009-07-23 05:23:54 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2009-07-23 05:23:54 +0000
commite96da7e52fab662aef7395c38e1456c8496a39c5 (patch)
tree7ebe543e78318c78ac73d501cfaeac78daa3c70e
parente6d37f76aca38d33e0c8448edce01487cfbc4a1c (diff)
downloadrockbox-e96da7e52fab662aef7395c38e1456c8496a39c5.tar.gz
rockbox-e96da7e52fab662aef7395c38e1456c8496a39c5.tar.bz2
rockbox-e96da7e52fab662aef7395c38e1456c8496a39c5.zip
Get cuesheets working again (hopefully fixes FS#10460), on swcodec only read the cuesheet from the buffer once
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22012 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playback.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/playback.c b/apps/playback.c
index 1874430823..398f00da3b 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -577,7 +577,7 @@ struct mp3entry* audio_current_track(void)
if (cur_idx == track_ridx && *thistrack_id3->path)
{
/* The usual case */
- if (tracks[cur_idx].cuesheet_hid >= 0)
+ if (tracks[cur_idx].cuesheet_hid >= 0 && !thistrack_id3->cuesheet)
{
bufread(tracks[cur_idx].cuesheet_hid, sizeof(struct cuesheet), curr_cue);
thistrack_id3->cuesheet = curr_cue;
@@ -591,7 +591,7 @@ struct mp3entry* audio_current_track(void)
but the audio being played is still the same (now previous) track.
othertrack_id3.elapsed is being updated in an ISR by
codec_pcmbuf_position_callback */
- if (tracks[cur_idx].cuesheet_hid >= 0)
+ if (tracks[cur_idx].cuesheet_hid >= 0 && !thistrack_id3->cuesheet)
{
bufread(tracks[cur_idx].cuesheet_hid, sizeof(struct cuesheet), curr_cue);
othertrack_id3->cuesheet = curr_cue;