diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2009-07-23 05:23:54 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2009-07-23 05:23:54 +0000 |
| commit | e96da7e52fab662aef7395c38e1456c8496a39c5 (patch) | |
| tree | 7ebe543e78318c78ac73d501cfaeac78daa3c70e /apps | |
| parent | e6d37f76aca38d33e0c8448edce01487cfbc4a1c (diff) | |
| download | rockbox-e96da7e52fab662aef7395c38e1456c8496a39c5.tar.gz 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
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/playback.c | 4 |
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) | |||
| 577 | if (cur_idx == track_ridx && *thistrack_id3->path) | 577 | if (cur_idx == track_ridx && *thistrack_id3->path) |
| 578 | { | 578 | { |
| 579 | /* The usual case */ | 579 | /* The usual case */ |
| 580 | if (tracks[cur_idx].cuesheet_hid >= 0) | 580 | if (tracks[cur_idx].cuesheet_hid >= 0 && !thistrack_id3->cuesheet) |
| 581 | { | 581 | { |
| 582 | bufread(tracks[cur_idx].cuesheet_hid, sizeof(struct cuesheet), curr_cue); | 582 | bufread(tracks[cur_idx].cuesheet_hid, sizeof(struct cuesheet), curr_cue); |
| 583 | thistrack_id3->cuesheet = curr_cue; | 583 | thistrack_id3->cuesheet = curr_cue; |
| @@ -591,7 +591,7 @@ struct mp3entry* audio_current_track(void) | |||
| 591 | but the audio being played is still the same (now previous) track. | 591 | but the audio being played is still the same (now previous) track. |
| 592 | othertrack_id3.elapsed is being updated in an ISR by | 592 | othertrack_id3.elapsed is being updated in an ISR by |
| 593 | codec_pcmbuf_position_callback */ | 593 | codec_pcmbuf_position_callback */ |
| 594 | if (tracks[cur_idx].cuesheet_hid >= 0) | 594 | if (tracks[cur_idx].cuesheet_hid >= 0 && !thistrack_id3->cuesheet) |
| 595 | { | 595 | { |
| 596 | bufread(tracks[cur_idx].cuesheet_hid, sizeof(struct cuesheet), curr_cue); | 596 | bufread(tracks[cur_idx].cuesheet_hid, sizeof(struct cuesheet), curr_cue); |
| 597 | othertrack_id3->cuesheet = curr_cue; | 597 | othertrack_id3->cuesheet = curr_cue; |