From 7d51325b1dc07ee72c9c21c99b9b9b685ac29936 Mon Sep 17 00:00:00 2001 From: Ryan Jackson Date: Wed, 12 Oct 2005 08:49:37 +0000 Subject: [PATCH] Skip buffer refill after end of playlist (conf_watermark == 0). With 'move to next folder' enabled, the last song in the folder was being buffered a second time if filebufused == 0 and the end of the playlist had been reached. This caused moving to the next folder to fail on some Vorbis files. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7622 a1c6a512-1295-4272-9138-f99709370657 --- apps/playback.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/playback.c b/apps/playback.c index 9de87782c8..4d73c35132 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -1345,8 +1345,9 @@ void initialize_buffer_fill(void) void audio_check_buffer(void) { /* Start buffer filling as necessary. */ - if ((filebufused > conf_watermark || !queue_empty(&audio_queue) - || !playing || ci.stop_codec || ci.reload_codec) && !filling) + if ((!conf_watermark || filebufused > conf_watermark + || !queue_empty(&audio_queue) || !playing || ci.stop_codec + || ci.reload_codec) && !filling) return ; initialize_buffer_fill();