summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-02-23 22:52:15 +0000
committerThomas Martitz <kugel@rockbox.org>2009-02-23 22:52:15 +0000
commit25b43346549b3395fae534f1ff581b0df6dc64b6 (patch)
tree44608d51611d6f829a46b8a6ed40d550512a4ae7
parentd7dee56b86c2846d5d656669cbc36f7a6a36c06d (diff)
downloadrockbox-25b43346549b3395fae534f1ff581b0df6dc64b6.tar.gz
rockbox-25b43346549b3395fae534f1ff581b0df6dc64b6.zip
Now that filling is supposed to be reliable we can safely calculate the watermark at the end of buffering, not after every single track.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20095 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/playback.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/playback.c b/apps/playback.c
index d75ecb1781..2421774381 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -2425,6 +2425,8 @@ static void audio_thread(void)
2425 while (1) 2425 while (1)
2426 { 2426 {
2427 if (filling != STATE_FILLING) { 2427 if (filling != STATE_FILLING) {
2428 /* End of buffering, let's calculate the watermark and unboost */
2429 set_filebuf_watermark();
2428 cancel_cpu_boost(); 2430 cancel_cpu_boost();
2429 } 2431 }
2430 2432
@@ -2436,7 +2438,6 @@ static void audio_thread(void)
2436 case Q_AUDIO_FILL_BUFFER: 2438 case Q_AUDIO_FILL_BUFFER:
2437 LOGFQUEUE("audio < Q_AUDIO_FILL_BUFFER %d", (int)ev.data); 2439 LOGFQUEUE("audio < Q_AUDIO_FILL_BUFFER %d", (int)ev.data);
2438 audio_fill_file_buffer((bool)ev.data, 0); 2440 audio_fill_file_buffer((bool)ev.data, 0);
2439 set_filebuf_watermark();
2440 break; 2441 break;
2441 2442
2442 case Q_AUDIO_FINISH_LOAD: 2443 case Q_AUDIO_FINISH_LOAD: