1 files changed, 6 insertions, 2 deletions
diff --git a/scene/audio/audio_stream_player.h b/scene/audio/audio_stream_player.h
index 590bef95b0..0b782b67e7 100644
--- a/scene/audio/audio_stream_player.h
+++ b/scene/audio/audio_stream_player.h
@@ -49,17 +49,20 @@ private:
 	Ref<AudioStreamPlayback> stream_playback;
 	Ref<AudioStream> stream;
 	Vector<AudioFrame> mix_buffer;
+	Vector<AudioFrame> fadeout_buffer;
+	bool use_fadeout;
 
 	volatile float setseek;
 	volatile bool active;
+	volatile bool setstop;
+	volatile bool stop_has_priority;
 
 	float mix_volume_db;
 	float pitch_scale;
 	float volume_db;
 	bool autoplay;
 	bool stream_paused;
-	bool stream_fade;
-	bool stream_stop;
+	bool stream_paused_fade;
 	StringName bus;
 
 	MixTarget mix_target;
@@ -72,6 +75,7 @@ private:
 	bool _is_active() const;
 
 	void _bus_layout_changed();
+	void _mix_to_bus(const AudioFrame *p_frames, int p_amount);
 
 protected:
 	void _validate_property(PropertyInfo &property) const;