godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46151 from ellenhp/fix_spatial_player_play

Browse Source 
Fix a pop on play() in AudioStreamPlayer2D and 3D
This commit is contained in:
Rémi Verschelde 2021-02-18 10:12:13 +01:00 committed by GitHub
commit 9d84e3b395
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/2d/audio_stream_player_2d.cpp
View File

@ -311,7 +311,6 @@ void AudioStreamPlayer2D::play(float p_from_pos) {
} }
if (stream_playback.is_valid()) { if (stream_playback.is_valid()) {
active = true;
setplay = p_from_pos; setplay = p_from_pos;
output_ready = false; output_ready = false;
set_physics_process_internal(true); set_physics_process_internal(true);
@ -334,7 +333,7 @@ void AudioStreamPlayer2D::stop() {
bool AudioStreamPlayer2D::is_playing() const { bool AudioStreamPlayer2D::is_playing() const {
if (stream_playback.is_valid()) { if (stream_playback.is_valid()) {
return active; // && stream_playback->is_playing(); return active || setplay >= 0;
} }
return false; return false;

3
scene/3d/audio_stream_player_3d.cpp
View File

@ -683,7 +683,6 @@ void AudioStreamPlayer3D::play(float p_from_pos) {
} }
if (stream_playback.is_valid()) { if (stream_playback.is_valid()) {
active = true;
setplay = p_from_pos; setplay = p_from_pos;
output_ready = false; output_ready = false;
set_physics_process_internal(true); set_physics_process_internal(true);
@ -706,7 +705,7 @@ void AudioStreamPlayer3D::stop() {
bool AudioStreamPlayer3D::is_playing() const { bool AudioStreamPlayer3D::is_playing() const {
if (stream_playback.is_valid()) { if (stream_playback.is_valid()) {
return active; // && stream_playback->is_playing(); return active || setplay >= 0;
} }
return false; return false;