1 files changed, 10 insertions, 5 deletions

diff --git a/servers/audio_server.h b/servers/audio_server.h
index 18e173ff0b..588107c25d 100644
--- a/servers/audio_server.h
+++ b/servers/audio_server.h
@@ -43,7 +43,7 @@
 
 class AudioDriverDummy;
 class AudioStream;
-class AudioStreamSample;
+class AudioStreamWAV;
 class AudioStreamPlayback;
 
 class AudioDriver {
@@ -94,7 +94,7 @@ public:
 	virtual void start() = 0;
 	virtual int get_mix_rate() const = 0;
 	virtual SpeakerMode get_speaker_mode() const = 0;
-	virtual Array get_device_list();
+	virtual PackedStringArray get_device_list();
 	virtual String get_device();
 	virtual void set_device(String device) {}
 	virtual void lock() = 0;
@@ -105,7 +105,7 @@ public:
 	virtual Error capture_stop() { return FAILED; }
 	virtual void capture_set_device(const String &p_name) {}
 	virtual String capture_get_device() { return "Default"; }
-	virtual Array capture_get_device_list(); // TODO: convert this and get_device_list to PackedStringArray
+	virtual PackedStringArray capture_get_device_list();
 
 	virtual float get_latency() { return 0; }
 
@@ -187,6 +187,8 @@ private:
 
 	float playback_speed_scale = 1.0f;
 
+	bool tag_used_audio_streams = false;
+
 	struct Bus {
 		StringName name;
 		bool solo = false;
@@ -380,6 +382,7 @@ public:
 	bool is_playback_paused(Ref<AudioStreamPlayback> p_playback);
 
 	uint64_t get_mix_count() const;
+	uint64_t get_mixed_frames() const;
 
 	void notify_listener_changed();
 
@@ -416,14 +419,16 @@ public:
 	void set_bus_layout(const Ref<AudioBusLayout> &p_bus_layout);
 	Ref<AudioBusLayout> generate_bus_layout() const;
 
-	Array get_device_list();
+	PackedStringArray get_device_list();
 	String get_device();
 	void set_device(String device);
 
-	Array capture_get_device_list();
+	PackedStringArray capture_get_device_list();
 	String capture_get_device();
 	void capture_set_device(const String &p_name);
 
+	void set_enable_tagging_used_audio_streams(bool p_enable);
+
 	AudioServer();
 	virtual ~AudioServer();
 };