From a9ac3d12ea01f562343c91118b8856feb94c5ca4 Mon Sep 17 00:00:00 2001 From: Miika Pekkarinen Date: Wed, 8 Jun 2005 10:45:40 +0000 Subject: Next track bug fixed that was introduced in previous commit. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6606 a1c6a512-1295-4272-9138-f99709370657 --- apps/playback.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/playback.c b/apps/playback.c index fef65f1e7d..1c9c12443c 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -565,19 +565,18 @@ bool loadcodec(const char *trackname, bool start_play) return true; } -bool audio_load_track(int offset, bool start_play) +bool audio_load_track(int offset, bool start_play, int peek_offset) { char *trackname; int fd; off_t size; int rc, i; int copy_n; - int last_offset = 0; if (track_count >= MAX_TRACK) return false; - trackname = playlist_peek(last_offset); + trackname = playlist_peek(peek_offset); if (!trackname) { return false; } @@ -639,7 +638,6 @@ bool audio_load_track(int offset, bool start_play) break ; } - last_offset++; track_count++; i = tracks[track_widx].filepos; while (i < size) { @@ -694,11 +692,13 @@ bool audio_load_track(int offset, bool start_play) void audio_insert_tracks(int offset, bool start_playing) { + int peek_offset = 0; fill_bytesleft = codecbuflen - codecbufused; filling = true; - while (audio_load_track(offset, start_playing)) { + while (audio_load_track(offset, start_playing, peek_offset)) { start_playing = false; offset = 0; + peek_offset++; } filling = false; } -- cgit v1.2.3