Backport r24968 again. svn diff -r PREV was too greedy in the previous commit.v3.5.1-finalv3.5

Make the buffer low-level watermark (and the related anti-skip setting) work again. Update the buffering 'base handle' as new tracks start playing, since this is needed to determine how much playable data is left in the buffer. Should fix the buffering problem reported in the forums (http://forums.rockbox.org/index.php?topic=24014.0), and also makes the usefl line in the buffering thread debug screen useful again.


git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_5@25010 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 2 insertions, 0 deletions

diff --git a/apps/playback.c b/apps/playback.c
index b7078441c2..90a5e4384b 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -1565,6 +1565,7 @@ static int audio_check_new_track(void)
 
     /* Move to the new track */
     track_ridx = (track_ridx + ci.new_track) & MAX_TRACK_MASK;
+    buf_set_base_handle(CUR_TI->audio_hid);
 
 
     if (automatic_skip)
@@ -1723,6 +1724,7 @@ static void audio_play_start(size_t offset)
 
     sound_set_volume(global_settings.volume);
     track_widx = track_ridx = 0;
+    buf_set_base_handle(-1);
 
     /* Clear all track entries. */
     for (i = 0; i < MAX_TRACK; i++) {