diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2021-08-23 20:36:48 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-23 20:36:48 -0300 |
| commit | aa3c3a9ebbc096bba9eda324b91acbb7f14a7b07 (patch) | |
| tree | 5db9dc95f2d2d552a52349bd22578032727d682d /scene | |
| parent | 0df9895eb755dba7ec9bd764c36fa873175bc256 (diff) | |
| parent | 44d62a9f4b6ac892b1fb9b8998be4162409952e3 (diff) | |
Merge pull request #52036 from reduz/native-extension-argument-pointers
Implement NativeExtension pointer arguments
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/2d/audio_stream_player_2d.cpp | 6 | ||||
| -rw-r--r-- | scene/3d/audio_stream_player_3d.cpp | 6 | ||||
| -rw-r--r-- | scene/audio/audio_stream_player.cpp | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index e0b994f27d..8a4d42fd1f 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -272,8 +272,12 @@ void AudioStreamPlayer2D::set_stream(Ref<AudioStream> p_stream) { } if (p_stream.is_valid()) { - stream = p_stream; stream_playback = p_stream->instance_playback(); + if (stream_playback.is_valid()) { + stream = p_stream; + } else { + stream.unref(); + } } AudioServer::get_singleton()->unlock(); diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index d2424c9a3b..3b44580264 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -624,8 +624,12 @@ void AudioStreamPlayer3D::set_stream(Ref<AudioStream> p_stream) { } if (p_stream.is_valid()) { - stream = p_stream; stream_playback = p_stream->instance_playback(); + if (stream_playback.is_valid()) { + stream = p_stream; + } else { + stream.unref(); + } } AudioServer::get_singleton()->unlock(); diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp index 298d75b668..9383355292 100644 --- a/scene/audio/audio_stream_player.cpp +++ b/scene/audio/audio_stream_player.cpp @@ -202,8 +202,12 @@ void AudioStreamPlayer::set_stream(Ref<AudioStream> p_stream) { } if (p_stream.is_valid()) { - stream = p_stream; stream_playback = p_stream->instance_playback(); + if (stream_playback.is_valid()) { + stream = p_stream; + } else { + stream.unref(); + } } AudioServer::get_singleton()->unlock(); |