Fix monitoring feeds

Author: adamscott

drivers/apple/microphone_driver_avfoundation.h

@@ -72,7 +72,7 @@ class MicrophoneDriverAVFoundation : public MicrophoneDriver {
 	virtual void deactivate_feed(Ref<MicrophoneFeed> p_feed) override;
 
 	virtual void set_monitoring_feeds(bool p_monitoring_feeds) override;
-	virtual bool get_monitoring_feeds() const override;
+	virtual bool is_monitoring_feeds() const override;
 
 	virtual String get_name() const override { return String("AVFoundation"); }
 

drivers/apple/microphone_driver_avfoundation.mm

@@ -83,7 +83,7 @@
 	device_notifications = [[MicrophoneDeviceNotification alloc] initForDriver:this];
 }
 
-bool MicrophoneDriverAVFoundation::get_monitoring_feeds() const {
+bool MicrophoneDriverAVFoundation::is_monitoring_feeds() const {
 	return device_notifications != nil;
 }
 

servers/microphone/microphone_driver.h

@@ -53,7 +53,7 @@ class MicrophoneDriver {
 	virtual void deactivate_feed(Ref<MicrophoneFeed> p_feed) = 0;
 
 	virtual void set_monitoring_feeds(bool p_monitoring_feeds) = 0;
-	virtual bool get_monitoring_feeds() const = 0;
+	virtual bool is_monitoring_feeds() const = 0;
 
 	virtual String get_name() const = 0;
 	virtual Error init();
@@ -68,7 +68,7 @@ class MicrophoneDriverDummy : public MicrophoneDriver {
 	virtual void update_feeds() {}
 
 	virtual void set_monitoring_feeds(bool p_monitoring_feeds) {}
-	virtual bool get_monitoring_feeds() const { return false; }
+	virtual bool is_monitoring_feeds() const { return false; }
 	virtual bool activate_feed(Ref<MicrophoneFeed> p_feed) { return false; }
 	virtual void deactivate_feed(Ref<MicrophoneFeed> p_feed) {}
 

servers/microphone/microphone_server.cpp

@@ -31,10 +31,19 @@
 #include "microphone_server.h"
 
 #include "core/variant/typed_array.h"
+#include "servers/microphone/microphone_driver.h"
 #include "servers/microphone/microphone_feed.h"
 
 MicrophoneServer *MicrophoneServer::singleton = nullptr;
 
+void MicrophoneServer::set_monitoring_feeds(bool p_monitoring_feeds) {
+	MicrophoneDriver::get_singleton()->set_monitoring_feeds(p_monitoring_feeds);
+}
+
+bool MicrophoneServer::is_monitoring_feeds() const {
+	return MicrophoneDriver::get_singleton()->is_monitoring_feeds();
+}
+
 int MicrophoneServer::get_free_id() {
 	bool id_exists = true;
 	int newid = 0;

servers/microphone/microphone_server.h

@@ -52,8 +52,8 @@ class MicrophoneServer : public Object {
 public:
 	static MicrophoneServer *get_singleton() { return singleton; }
 
-	virtual void set_monitoring_feeds(bool p_monitoring_feeds) { monitoring_feeds = p_monitoring_feeds; }
-	_FORCE_INLINE_ bool is_monitoring_feeds() const { return monitoring_feeds; }
+	virtual void set_monitoring_feeds(bool p_monitoring_feeds);
+	bool is_monitoring_feeds() const;
 
 	// Right now we identify our feed by it's ID when it's used in the background.
 	// May see if we can change this to purely relying on MicrophoneFeed objects or by name.
@@ -70,8 +70,6 @@ class MicrophoneServer : public Object {
 	int get_feed_count();
 	TypedArray<MicrophoneFeed> get_feeds();
 
-	MicrophoneServer *create(int p_microphone_driver_index);
-
 	void init();
 
 	MicrophoneServer();