update enumerate video devices with ipc::value

Author: sandboxcoder

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

@@ -2,12 +2,9 @@
 
 #ifdef __APPLE__
 
-#include <string>
-#include <utility>
+#include "ipc-value.hpp"
 #include <vector>
 
-// 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();
+void enumVideoDevicesMacOS(std::vector<ipc::value> &rval);
 
 #endif

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

@@ -1,12 +1,14 @@
 #include "nodeobs_settings-osx.h"
-
+#include "osn-error.hpp"
 #import <AVFoundation/AVFoundation.h>
 
 // This implementation must remain in-sync with plugins/mac-avcapture/plugin-properties.m.
 // Implementation reference: properties_update_device function.
-std::vector<std::pair<std::string, std::string>> getVideoDevicesMacOS()
+void enumVideoDevicesMacOS(std::vector<ipc::value> &rval)
 {
-	std::vector<std::pair<std::string, std::string>> result;
+	rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
+	uint32_t count = 0;
+	rval.push_back(ipc::value(0));
 
 	@autoreleasepool {
 		NSArray *deviceTypes;
@@ -23,7 +25,9 @@
 		for (AVCaptureDevice *device in session.devices) {
 			if (!device.localizedName || !device.uniqueID)
 				continue;
-			result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]});
+			rval.push_back(ipc::value([device.localizedName UTF8String]));
+			rval.push_back(ipc::value([device.uniqueID UTF8String]));
+			count++;
 		}
 
 		AVCaptureDeviceDiscoverySession *muxedDiscoverySession = [AVCaptureDeviceDiscoverySession
@@ -33,9 +37,11 @@
 		for (AVCaptureDevice *device in muxedDiscoverySession.devices) {
 			if (!device.localizedName || !device.uniqueID)
 				continue;
-			result.push_back({[device.localizedName UTF8String], [device.uniqueID UTF8String]});
+			rval.push_back(ipc::value([device.localizedName UTF8String]));
+			rval.push_back(ipc::value([device.uniqueID UTF8String]));
+			count++;
 		}
 	}
 
-	return result;
+	rval[1] = ipc::value(count);
 }

obs-studio-server/source/nodeobs_settings.cpp

@@ -3870,7 +3870,7 @@ void OBS_settings::saveGenericSettings(std::vector<SubCategory> genericSettings,
 // plugins this is fine but should be avoided for plugins like mac-coreaudio
 // because it will create a reconnect_thread. Also might not work for
 // mac_avcapture_fast because this plugin requires that graphics is init first.
-void getDevicesUsingDummySource(const char *source_id, const char *property_name, std::vector<ipc::value> &rval)
+void enumDevicesUsingDummySource(const char *source_id, const char *property_name, std::vector<ipc::value> &rval)
 {
 	OBSDataAutoRelease settings = obs_get_source_defaults(source_id);
 	if (!settings) {
@@ -4137,17 +4137,11 @@ void OBS_settings::OBS_settings_getVideoDevices(void *data, const int64_t id, co
 	if (args.size() > 0)
 		sourceId = args[0].value_str;
 	if (!sourceId.empty()) {
-		getDevicesUsingDummySource(sourceId.c_str(), "device", rval);
+		enumDevicesUsingDummySource(sourceId.c_str(), "device", rval);
 	} else {
-		rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
 		// Enumerate video devices manually so we can use any plugin
 		// such as mac_avcapture_fast.
-		auto devices = getVideoDevicesMacOS();
-		rval.push_back(ipc::value((uint64_t)devices.size()));
-		for (const auto &[name, uid] : devices) {
-			rval.push_back(ipc::value(name.c_str()));
-			rval.push_back(ipc::value(uid.c_str()));
-		}
+		enumVideoDevicesMacOS(rval);
 	}
 #endif