cleanup getDevices and add fallback for older MacOS

Author: sandboxcoder

obs-studio-server/source/nodeobs_settings-osx.h

@@ -6,8 +6,8 @@
 #include <utility>
 #include <vector>
 
-// Returns (localizedName, uniqueID) pairs for all connected video capture devices.
-// Requires macOS 12 or later; returns an empty vector on older systems.
+// Returns (localizedName, uniqueID) pairs for connected video capture devices.
+// Availability and results depend on the runtime implementation and OS support.
 std::vector<std::pair<std::string, std::string>> getVideoDevicesMacOS();
 
 #endif

obs-studio-server/source/nodeobs_settings-osx.mm

@@ -7,8 +7,7 @@
 	std::vector<std::pair<std::string, std::string>> result;
 
 	if (@available(macOS 12.0, *)) {
-		NSMutableArray<AVCaptureDeviceType> *deviceTypes =
-			[NSMutableArray arrayWithObject:AVCaptureDeviceTypeBuiltInWideAngleCamera];
+		NSMutableArray<AVCaptureDeviceType> *deviceTypes = [NSMutableArray arrayWithObject:AVCaptureDeviceTypeBuiltInWideAngleCamera];
 
 		if (@available(macOS 13.0, *)) {
 			[deviceTypes addObject:AVCaptureDeviceTypeExternal];
@@ -21,16 +20,23 @@
 #pragma clang diagnostic pop
 		}
 
-		AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession
-			discoverySessionWithDeviceTypes:deviceTypes
-			                      mediaType:AVMediaTypeVideo
-			                       position:AVCaptureDevicePositionUnspecified];
+		AVCaptureDeviceDiscoverySession *session = [AVCaptureDeviceDiscoverySession discoverySessionWithDeviceTypes:deviceTypes
+														  mediaType:AVMediaTypeVideo
+														   position:AVCaptureDevicePositionUnspecified];
 
 		for (AVCaptureDevice *device in session.devices) {
 			if (!device.localizedName || !device.uniqueID)
 				continue;
 			result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]});
 		}
+	} else {
+		NSArray<AVCaptureDevice *> *devices = [AVCaptureDevice devicesWithMediaType:AVMediaTypeVideo];
+
+		for (AVCaptureDevice *device in devices) {
+			if (!device.localizedName || !device.uniqueID)
+				continue;
+			result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]});
+		}
 	}
 
 	return result;

obs-studio-server/source/nodeobs_settings.cpp

@@ -37,7 +37,6 @@
 #ifdef __APPLE__
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <CoreAudio/CoreAudio.h>
 #include "nodeobs_settings-osx.h"
 #endif
 
@@ -3868,20 +3867,8 @@ void OBS_settings::saveGenericSettings(std::vector<SubCategory> genericSettings,
 
 void getDevices(const char *source_id, const char *property_name, std::vector<ipc::value> &rval)
 {
-	auto settings = obs_get_source_defaults(source_id);
-	if (!settings)
-		return;
-
-	const char *dummy_device_name = "does_not_exist";
-	obs_data_set_string(settings, property_name, dummy_device_name);
-	if (strcmp(source_id, "dshow_input") == 0) {
-		obs_data_set_string(settings, "video_device_id", dummy_device_name);
-		obs_data_set_string(settings, "audio_device_id", dummy_device_name);
-	}
-
 	auto props = obs_get_source_properties(source_id);
 	if (!props) {
-		obs_data_release(settings);
 		blog(LOG_WARNING, "Could not get source properties for source id: %s", source_id);
 		return;
 	}
@@ -3890,7 +3877,6 @@ void getDevices(const char *source_id, const char *property_name, std::vector<ip
 	if (!prop) {
 		blog(LOG_WARNING, "Could not get the property [%s] for source id: %s", property_name, source_id);
 		obs_properties_destroy(props);
-		obs_data_release(settings);
 		return;
 	}
 
@@ -3914,7 +3900,6 @@ void getDevices(const char *source_id, const char *property_name, std::vector<ip
 	}
 
 	obs_properties_destroy(props);
-	obs_data_release(settings);
 }
 
 #ifdef WIN32
@@ -4091,11 +4076,11 @@ void OBS_settings::OBS_settings_getVideoDevices(void *data, const int64_t id, co
 	rval.push_back(ipc::value((uint32_t)0));
 	enumVideoDevices(rval);
 #elif __APPLE__
-    // Here we do not invoke getDevices() because the mac-capture
-    // plugin will not enumerate video devices unless it is fully initialized.
-    // So instead, we will enumerate video devices manually. Hopefully,
-    // mac-capture doesn't do anything special to enumerate video devices.
-    // If so, then this implementation will need to be updated.
+	// Here we do not invoke getDevices() because the mac-capture
+	// plugin will not enumerate video devices unless it is fully initialized.
+	// So instead, we will enumerate video devices manually. Hopefully,
+	// mac-capture doesn't do anything special to enumerate video devices.
+	// If so, then this implementation will need to be updated.
 	auto devices = getVideoDevicesMacOS();
 	rval.push_back(ipc::value((uint64_t)devices.size()));
 	for (const auto &[name, uid] : devices) {