diff options
author | Steve Bavin <pondlife@pondlife.me> | 2008-02-29 23:27:55 +0000 |
---|---|---|
committer | Steve Bavin <pondlife@pondlife.me> | 2008-02-29 23:27:55 +0000 |
commit | bda6f573da23e4b09c57556a6a72d6ddfe1e65e0 (patch) | |
tree | 3b90edc49c835bf6f8f85287ea3ae20587d101f9 /apps | |
parent | 886549010611e06b1589f9bc7b18895ad2e707be (diff) | |
download | rockbox-bda6f573da23e4b09c57556a6a72d6ddfe1e65e0.tar.gz rockbox-bda6f573da23e4b09c57556a6a72d6ddfe1e65e0.zip |
Fix odd behaviour when rebuffering occurs during playback. This is hopefully the last nail in the coffins of FS#8455 and FS#8513, but I'll let some FLAC and Ogg users be the judge of that.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16459 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/playback.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/apps/playback.c b/apps/playback.c index 198337cd61..57fca1c00f 100644 --- a/apps/playback.c +++ b/apps/playback.c | |||
@@ -687,7 +687,6 @@ static void audio_skip(int direction) | |||
687 | wps_offset += direction; | 687 | wps_offset += direction; |
688 | /* Immediately update the playlist index */ | 688 | /* Immediately update the playlist index */ |
689 | playlist_next(direction); | 689 | playlist_next(direction); |
690 | last_peek_offset -= direction; | ||
691 | track_changed = true; | 690 | track_changed = true; |
692 | } | 691 | } |
693 | else | 692 | else |
@@ -2046,11 +2045,11 @@ static int audio_check_new_track(void) | |||
2046 | } | 2045 | } |
2047 | } | 2046 | } |
2048 | 2047 | ||
2048 | /* Update the playlist */ | ||
2049 | last_peek_offset -= ci.new_track; | ||
2050 | |||
2049 | if (auto_dir_skip) | 2051 | if (auto_dir_skip) |
2050 | { | 2052 | { |
2051 | /* Update the playlist */ | ||
2052 | last_peek_offset -= ci.new_track; | ||
2053 | |||
2054 | /* If the track change was the result of an auto dir skip, | 2053 | /* If the track change was the result of an auto dir skip, |
2055 | we need to update the playlist now */ | 2054 | we need to update the playlist now */ |
2056 | next_playlist_index = playlist_next(ci.new_track); | 2055 | next_playlist_index = playlist_next(ci.new_track); |