diff options
author | Hardeep Sidhu <dyp@pobox.com> | 2006-06-03 17:23:20 +0000 |
---|---|---|
committer | Hardeep Sidhu <dyp@pobox.com> | 2006-06-03 17:23:20 +0000 |
commit | 5483da667bb303007829b6abe755735a3ccc3981 (patch) | |
tree | 7140fd6bfb81a7fa50608da5d939c58ff42be922 | |
parent | ae0c1af6ce39b2dc770d33f3a4fb1cdb1308533f (diff) | |
download | rockbox-5483da667bb303007829b6abe755735a3ccc3981.tar.gz rockbox-5483da667bb303007829b6abe755735a3ccc3981.zip |
Previous automatic skip fix had a problem if audio_fill_file_buffer() was called after setting playlist_end but before audio_check_new_track(). To fix this, playlist_end is now reset in audio_check_new_track().
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10039 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/playback.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/playback.c b/apps/playback.c index cc0c8a936f..ce0b45fe5e 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -964,6 +964,9 @@ static void audio_check_new_track(void) /* Move to the new track */ cur_ti = &tracks[track_ridx]; + if (automatic_skip) + playlist_end = false; + track_changed = !automatic_skip; /* If it is not safe to even skip this many track entries */ @@ -2007,7 +2010,6 @@ static bool load_next_track(void) { { ci.new_track++; automatic_skip = true; - playlist_end = false; } cpu_boost(true); @@ -2031,8 +2033,6 @@ static bool load_next_track(void) { case Q_CODEC_REQUEST_FAILED: ci.new_track = 0; ci.stop_codec = true; - if (automatic_skip) - playlist_end = true; return false; default: logf("Bad event on ccq"); |