diff options
| author | Ellen Poe <ellen@ellenhp.me> | 2021-02-17 19:09:42 -0800 |
|---|---|---|
| committer | Ellen Poe <ellen@ellenhp.me> | 2021-02-17 19:09:42 -0800 |
| commit | 5e1442ad55f4e21e8bfca45890369c23c1887c49 (patch) | |
| tree | b94bca2ff828bdafa662c056e533465725f59ee7 /scene | |
| parent | a59286f0198c7a3141fc9a8af4d458c7dcfbf653 (diff) | |
| download | redot-engine-5e1442ad55f4e21e8bfca45890369c23c1887c49.tar.gz | |
Fix pops in play() of both spatial audio players
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/2d/audio_stream_player_2d.cpp | 3 | ||||
| -rw-r--r-- | scene/3d/audio_stream_player_3d.cpp | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index 4e7eec906c..ea47ef5ff9 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -311,7 +311,6 @@ void AudioStreamPlayer2D::play(float p_from_pos) { } if (stream_playback.is_valid()) { - active = true; setplay = p_from_pos; output_ready = false; set_physics_process_internal(true); @@ -334,7 +333,7 @@ void AudioStreamPlayer2D::stop() { bool AudioStreamPlayer2D::is_playing() const { if (stream_playback.is_valid()) { - return active; // && stream_playback->is_playing(); + return active || setplay >= 0; } return false; diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index d420bd6075..485301481c 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -683,7 +683,6 @@ void AudioStreamPlayer3D::play(float p_from_pos) { } if (stream_playback.is_valid()) { - active = true; setplay = p_from_pos; output_ready = false; set_physics_process_internal(true); @@ -706,7 +705,7 @@ void AudioStreamPlayer3D::stop() { bool AudioStreamPlayer3D::is_playing() const { if (stream_playback.is_valid()) { - return active; // && stream_playback->is_playing(); + return active || setplay >= 0; } return false; |