aboutsummaryrefslogtreecommitdiff
path: root/src/audio_core
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
commit2b3756d167eca92e91f31bc8306abc6ea9aaacca (patch)
tree881149e2f9e318b9b1cd01d60a916e313dcdf922 /src/audio_core
parent4a0439e97acbb733e892a02ab9655a72bb2170ed (diff)
parent3b243f1b3e18f084950d46e324b7a61f13469c6c (diff)
Merge pull request #2661 from ogniK5377/audren-loop
audren: Only manage wave buffers with a size
Diffstat (limited to 'src/audio_core')
-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 9a0939883c..4882a6cd8f 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;
}
}