summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Hilman <DarkLordZach@users.noreply.github.com>2019-07-08 09:35:42 -0400
committerGitHub <noreply@github.com>2019-07-08 09:35:42 -0400
commit618d8446abe9f5803bfe7d2440753672e866b448 (patch)
tree881149e2f9e318b9b1cd01d60a916e313dcdf922
parent6c3cceafdc9383551d5abf91bad141c2caf58620 (diff)
parente3d000a7e66a7e2c7ecbd7ad9d6626b9bedf66a9 (diff)
Merge pull request #2661 from ogniK5377/audren-loop
audren: Only manage wave buffers with a size
-rw-r--r--src/audio_core/audio_renderer.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/audio_core/audio_renderer.cpp b/src/audio_core/audio_renderer.cpp
index 9a0939883..4882a6cd8 100644
--- a/src/audio_core/audio_renderer.cpp
+++ b/src/audio_core/audio_renderer.cpp
@@ -217,13 +217,15 @@ std::vector<s16> AudioRenderer::VoiceState::DequeueSamples(std::size_t sample_co
if (offset == samples.size()) {
offset = 0;
- if (!wave_buffer.is_looping) {
+ if (!wave_buffer.is_looping && wave_buffer.buffer_sz) {
SetWaveIndex(wave_index + 1);
}
- out_status.wave_buffer_consumed++;
+ if (wave_buffer.buffer_sz) {
+ out_status.wave_buffer_consumed++;
+ }
- if (wave_buffer.end_of_stream) {
+ if (wave_buffer.end_of_stream || wave_buffer.buffer_sz == 0) {
info.play_state = PlayState::Paused;
}
}