summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRyan Jackson <rdjackso@rockbox.org>2005-10-12 08:49:37 +0000
committerRyan Jackson <rdjackso@rockbox.org>2005-10-12 08:49:37 +0000
commit7d51325b1dc07ee72c9c21c99b9b9b685ac29936 (patch)
tree879a4e3d099206edc9185ca252691ba8a4adc5c0 /apps
parentaf0a264cf6f85197df8f15a696e7114e5b509847 (diff)
downloadrockbox-7d51325b1dc07ee72c9c21c99b9b9b685ac29936.tar.gz
rockbox-7d51325b1dc07ee72c9c21c99b9b9b685ac29936.tar.bz2
rockbox-7d51325b1dc07ee72c9c21c99b9b9b685ac29936.zip
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
Diffstat (limited to 'apps')
-rw-r--r--apps/playback.c5
1 files 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();