Browse Source

Fix pops in play() of both spatial audio players

(cherry picked from commit 5e1442ad55f4e21e8bfca45890369c23c1887c49)
Ellen Poe 4 years ago
parent
commit
8a426923c2
2 changed files with 2 additions and 4 deletions
  1. 1 2
      scene/2d/audio_stream_player_2d.cpp
  2. 1 2
      scene/3d/audio_stream_player_3d.cpp

+ 1 - 2
scene/2d/audio_stream_player_2d.cpp

@@ -323,7 +323,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);
@@ -349,7 +348,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;

+ 1 - 2
scene/3d/audio_stream_player_3d.cpp

@@ -707,7 +707,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);
@@ -733,7 +732,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;