update getDevices() to return errorCode properly & keep CI setting

Author: sandboxcoder

obs-studio-server/source/nodeobs_settings.cpp

@@ -20,6 +20,7 @@
 #include "osn-error.hpp"
 #include "nodeobs_api.h"
 #include "shared.hpp"
+#include <sstream>
 #include "memory-manager.h"
 #include "osn-video.hpp"
 #include "osn-encoders.hpp"
@@ -3869,29 +3870,30 @@ void getDevices(const char *source_id, const char *property_name, std::vector<ip
 {
 	auto props = obs_get_source_properties(source_id);
 	if (!props) {
-		blog(LOG_WARNING, "Could not get source properties for source id: %s", source_id);
-		return;
+        std::ostringstream ss;
+        ss << "Could not get source properties for source id: " << source_id;
+		PRETTY_ERROR_RETURN(ErrorCode::Error, ss.str());
 	}
 
 	auto prop = obs_properties_get(props, property_name);
 	if (!prop) {
-		blog(LOG_WARNING, "Could not get the property [%s] for source id: %s", property_name, source_id);
-		obs_properties_destroy(props);
-		return;
+        obs_properties_destroy(props);
+        std::ostringstream ss;
+        ss << "Could not get source property " << property_name << " for source id: " << source_id;
+        PRETTY_ERROR_RETURN(ErrorCode::Error, ss.str());
 	}
 
+    rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
 	size_t items = obs_property_list_item_count(prop);
-	if (rval.size() > 1)
-		rval[1].value_union.ui64 += items;
-	else
-		rval.push_back(ipc::value((uint64_t)items));
+	rval.push_back(ipc::value((uint64_t)items));
 
 	for (size_t idx = 0; idx < items; idx++) {
 		const char *description = obs_property_list_item_name(prop, idx);
 		const char *device_id = obs_property_list_item_string(prop, idx);
 
 		if (!description || !strcmp(description, "") || !device_id || !strcmp(device_id, "")) {
-			rval[1].value_union.ui64--;
+            if (rval[1].value_union.ui64 > 0)
+                rval[1].value_union.ui64--;
 			continue;
 		}
 
@@ -4036,9 +4038,8 @@ void enumAudioDevices(std::vector<ipc::value> &rval, EDataFlow dataFlow)
 
 void OBS_settings::OBS_settings_getInputAudioDevices(void *data, const int64_t id, const std::vector<ipc::value> &args, std::vector<ipc::value> &rval)
 {
-	rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
-
 #ifdef WIN32
+    rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
 	rval.push_back(ipc::value((uint32_t)1));
 	rval.push_back(ipc::value("Default"));
 	rval.push_back(ipc::value("default"));
@@ -4053,9 +4054,8 @@ void OBS_settings::OBS_settings_getInputAudioDevices(void *data, const int64_t i
 
 void OBS_settings::OBS_settings_getOutputAudioDevices(void *data, const int64_t id, const std::vector<ipc::value> &args, std::vector<ipc::value> &rval)
 {
-	rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
-
 #ifdef WIN32
+    rval.push_back(ipc::value((uint64_t)ErrorCode::Ok));
 	rval.push_back(ipc::value((uint32_t)1));
 	rval.push_back(ipc::value("Default"));
 	rval.push_back(ipc::value("default"));

tests/osn-tests/src/test_osn_audio.ts

@@ -70,7 +70,8 @@ describe(testName, () => {
                 foundDefaultDevice = true;
             }
         }
-        if (!obs.isDarwin()) { // On virtual mac(s) the default output device is not included in the list of output devices
+        // On the CI, mac-coreaudio will not return a default device unless there is another output audio device.
+        if (devices.length > 1) {
             expect(foundDefaultDevice).to.equal(true, GetErrorMessage(ETestErrorMsg.DefaultDeviceNotFound));
         }
     });

tests/osn-tests/util/obs_handler.ts

@@ -554,7 +554,7 @@ export class OBSHandler {
     isDarwin()
     {
         // Wrapped this in a function- just in case we want to add more conditions later or disable only within the build agent.
-        return this.os === 'darwin' && this.ci;
+        return this.os === 'darwin';
     }
 
     // is the build server environment