Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a pop on play() in AudioStreamPlayer2D and 3D #46151

Merged
merged 1 commit into from
Feb 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions scene/2d/audio_stream_player_2d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions scene/3d/audio_stream_player_3d.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
Expand Down