Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-25 05:33:11 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't try to mix a sample that has already ended

Browse Source 
On short samples the sample may finish playing before the mixer is done.
This fills the remaining time with zeros and ends mixing. This fixes the
users getting the following error logged:

::_mix_internal: Condition ' !active ' is true.
This commit is contained in:
Hein-Pieter van Braam 2017-12-17 22:31:35 +01:00
parent 89a32b4977
commit 139daf0e03
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
servers/audio/audio_stream.cpp
View File

@ -76,6 +76,13 @@ void AudioStreamPlaybackResampled::mix(AudioFrame *p_buffer, float p_rate_scale,
internal_buffer[1] = internal_buffer[INTERNAL_BUFFER_LEN + 1];
internal_buffer[2] = internal_buffer[INTERNAL_BUFFER_LEN + 2];
internal_buffer[3] = internal_buffer[INTERNAL_BUFFER_LEN + 3];
if (!is_playing()) {
for (int i = 4; i < INTERNAL_BUFFER_LEN; ++i) {
internal_buffer[i] = AudioFrame(0, 0);
}
return;
}
_mix_internal(internal_buffer + 4, INTERNAL_BUFFER_LEN);
mix_offset -= (INTERNAL_BUFFER_LEN << FP_BITS);
}