Add AudioStreamPlayerInternal to unify stream players

1 files changed, 6 insertions, 23 deletions

diff --git a/scene/2d/audio_stream_player_2d.h b/scene/2d/audio_stream_player_2d.h
index 267d6a625b..3552735cd7 100644
--- a/scene/2d/audio_stream_player_2d.h
+++ b/scene/2d/audio_stream_player_2d.h
@@ -32,9 +32,11 @@
 #define AUDIO_STREAM_PLAYER_2D_H
 
 #include "scene/2d/node_2d.h"
-#include "scene/scene_string_names.h"
-#include "servers/audio/audio_stream.h"
-#include "servers/audio_server.h"
+
+struct AudioFrame;
+class AudioStream;
+class AudioStreamPlayback;
+class AudioStreamPlayerInternal;
 
 class AudioStreamPlayer2D : public Node2D {
 	GDCLASS(AudioStreamPlayer2D, Node2D);
@@ -52,10 +54,8 @@ private:
 		Viewport *viewport = nullptr; //pointer only used for reference to previous mix
 	};
 
-	Vector<Ref<AudioStreamPlayback>> stream_playbacks;
-	Ref<AudioStream> stream;
+	AudioStreamPlayerInternal *internal = nullptr;
 
-	SafeFlag active{ false };
 	SafeNumeric<float> setplay{ -1.0 };
 	Ref<AudioStreamPlayback> setplayback;
 
@@ -64,21 +64,12 @@ private:
 	uint64_t last_mix_count = -1;
 	bool force_update_panning = false;
 
-	float volume_db = 0.0;
-	float pitch_scale = 1.0;
-	bool autoplay = false;
-	StringName default_bus = SceneStringNames::get_singleton()->Master;
-	int max_polyphony = 1;
-
 	void _set_playing(bool p_enable);
 	bool _is_active() const;
 
 	StringName _get_actual_bus();
 	void _update_panning();
 
-	void _on_bus_layout_changed();
-	void _on_bus_renamed(int p_bus_index, const StringName &p_old_name, const StringName &p_new_name);
-
 	static void _listener_changed_cb(void *self) { reinterpret_cast<AudioStreamPlayer2D *>(self)->force_update_panning = true; }
 
 	uint32_t area_mask = 1;
@@ -89,14 +80,6 @@ private:
 	float panning_strength = 1.0f;
 	float cached_global_panning_strength = 0.5f;
 
-	struct ParameterData {
-		StringName path;
-		Variant value;
-	};
-
-	HashMap<StringName, ParameterData> playback_parameters;
-	void _update_stream_parameters();
-
 protected:
 	void _validate_property(PropertyInfo &p_property) const;
 	void _notification(int p_what);