diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2009-06-10 17:15:10 +0000 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2009-06-10 17:15:10 +0000 |
| commit | fc0c2fb5463bc0c8821eab462aecef068680ad92 (patch) | |
| tree | c833220d8bba9490e516861ebf84b46454568818 | |
| parent | ec7c4895fe7a53944966fae6aaabd7bb5a1aa072 (diff) | |
| download | rockbox-fc0c2fb5463bc0c8821eab462aecef068680ad92.zip rockbox-fc0c2fb5463bc0c8821eab462aecef068680ad92.tar.gz rockbox-fc0c2fb5463bc0c8821eab462aecef068680ad92.tar.bz2 rockbox-fc0c2fb5463bc0c8821eab462aecef068680ad92.tar.xz | |
Fix FS#10101 and FS#8999. Buffering was stopped prematurely if a manual track skip occured in between, leaving the CPU boosted, because audio_fill_file_buffer() returned if a new track was requested no matter of the filling state. Now keep buffering if it's currently filling the buffer.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21244 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/playback.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/playback.c b/apps/playback.c index 16c04e1..2c526a7 100644 --- a/apps/playback.c +++ b/apps/playback.c @@ -1954,12 +1954,13 @@ static void audio_finish_load_track(void) static void audio_fill_file_buffer(bool start_play, size_t offset) { - filling = STATE_FILLING; trigger_cpu_boost(); - /* No need to rebuffer if there are track skips pending. */ - if (ci.new_track != 0) + /* No need to rebuffer if there are track skips pending, + * however don't cancel buffering on skipping while filling. */ + if (ci.new_track != 0 && filling != STATE_FILLING) return; + filling = STATE_FILLING; /* Must reset the buffer before use if trashed or voice only - voice file size shouldn't have changed so we can go straight from |