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

Fixed bug with clearing the stream in AudioPlayerStream

Browse source
This commit is contained in:
Marcelo Fernandez 2017-09-27 10:30:08 -03:00
parent dc18b8d7e8
commit f12b4e5fa3
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scene/audio/audio_player.cpp
View file

@ -122,7 +122,6 @@ void AudioStreamPlayer::_notification(int p_what) {
void AudioStreamPlayer::set_stream(Ref<AudioStream> p_stream) { void AudioStreamPlayer::set_stream(Ref<AudioStream> p_stream) {
ERR_FAIL_COND(!p_stream.is_valid());
AudioServer::get_singleton()->lock(); AudioServer::get_singleton()->lock();
mix_buffer.resize(AudioServer::get_singleton()->thread_get_mix_buffer_size()); mix_buffer.resize(AudioServer::get_singleton()->thread_get_mix_buffer_size());
@ -134,12 +133,14 @@ void AudioStreamPlayer::set_stream(Ref<AudioStream> p_stream) {
setseek = -1; setseek = -1;
} }
stream = p_stream; if (p_stream.is_valid()) {
stream_playback = p_stream->instance_playback(); stream = p_stream;
stream_playback = p_stream->instance_playback();
}
AudioServer::get_singleton()->unlock(); AudioServer::get_singleton()->unlock();
if (stream_playback.is_null()) { if (p_stream.is_valid() && stream_playback.is_null()) {
stream.unref(); stream.unref();
ERR_FAIL_COND(stream_playback.is_null()); ERR_FAIL_COND(stream_playback.is_null());
} }