asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14787 from hpvb/dont-try-to-mix-ended-sample

Browse source 
Don't try to mix a sample that has already ended
This commit is contained in:
Juan Linietsky 2017-12-19 18:55:43 -03:00 committed by GitHub
commit 85f5953d5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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);
}