midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3151 from MerryMage/looping-bug

Browse Source 
Audio/HLE/Source: Fix looped state not updating
This commit is contained in:
bunnei 2017-11-29 10:43:06 -05:00 committed by GitHub
commit 16dcec05d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/audio_core/hle/source.cpp
View File

@ -277,11 +277,7 @@ bool Source::DequeueBuffer() {
return false; return false;
Buffer buf = state.input_queue.top(); Buffer buf = state.input_queue.top();
state.input_queue.pop();
// if we're in a loop, the current sound keeps playing afterwards, so leave the queue alone
if (!buf.is_looping) {
state.input_queue.pop();
}
if (buf.adpcm_dirty) { if (buf.adpcm_dirty) {
state.adpcm_state.yn1 = buf.adpcm_yn[0]; state.adpcm_state.yn1 = buf.adpcm_yn[0];
@ -321,7 +317,10 @@ bool Source::DequeueBuffer() {
state.current_buffer_id = buf.buffer_id; state.current_buffer_id = buf.buffer_id;
state.buffer_update = buf.from_queue && !buf.has_played; state.buffer_update = buf.from_queue && !buf.has_played;
buf.has_played = true; if (buf.is_looping) {
buf.has_played = true;
state.input_queue.push(buf);
}
LOG_TRACE(Audio_DSP, "source_id=%zu buffer_id=%hu from_queue=%s current_buffer.size()=%zu", LOG_TRACE(Audio_DSP, "source_id=%zu buffer_id=%hu from_queue=%s current_buffer.size()=%zu",
source_id, buf.buffer_id, buf.from_queue ? "true" : "false", source_id, buf.buffer_id, buf.from_queue ? "true" : "false",