Custom Implementation for Default Device selection

Tested on Windows Requires OSX/Linux testing.
cemu-project · Nov 8, 2023 · e3b6426 · e3b6426
1 parent f3c95f7
commit e3b6426
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/audio/CubebAPI.cpp b/src/audio/CubebAPI.cpp
@@ -188,15 +188,19 @@ std::vector<IAudioAPI::DeviceDescriptionPtr> CubebAPI::GetDevices()
 		return {};
 
 	std::vector<DeviceDescriptionPtr> result;
-	result.reserve(devices.count);
+	result.reserve(devices.count + 1); // Reserve space for the default device
+
+	// Add the default device to the list
+	auto defaultDevice = std::make_shared<CubebDeviceDescription>(nullptr, "default", L"Default Device");
+	result.emplace_back(defaultDevice);
+
 	for (size_t i = 0; i < devices.count; ++i)
 	{
-		//const auto& device = devices.device[i];
 		if (devices.device[i].state == CUBEB_DEVICE_STATE_ENABLED)
 		{
 			auto device = std::make_shared<CubebDeviceDescription>(devices.device[i].devid, devices.device[i].device_id,
-			                                                       boost::nowide::widen(
-				                                                       devices.device[i].friendly_name));
+																   boost::nowide::widen(
+																	   devices.device[i].friendly_name));
 			result.emplace_back(device);
 		}
 	}

diff --git a/src/audio/CubebInputAPI.cpp b/src/audio/CubebInputAPI.cpp
@@ -180,15 +180,19 @@ std::vector<IAudioInputAPI::DeviceDescriptionPtr> CubebInputAPI::GetDevices()
 		return {};
 
 	std::vector<DeviceDescriptionPtr> result;
-	result.reserve(devices.count);
+	result.reserve(devices.count + 1); // Reserve space for the default device
+
+	// Add the default device to the list
+	auto defaultDevice = std::make_shared<CubebDeviceDescription>(nullptr, "default", L"Default Device");
+	result.emplace_back(defaultDevice);
+
 	for (size_t i = 0; i < devices.count; ++i)
 	{
-		//const auto& device = devices.device[i];
 		if (devices.device[i].state == CUBEB_DEVICE_STATE_ENABLED)
 		{
 			auto device = std::make_shared<CubebDeviceDescription>(devices.device[i].devid, devices.device[i].device_id,
-			                                                       boost::nowide::widen(
-				                                                       devices.device[i].friendly_name));
+																   boost::nowide::widen(
+																	   devices.device[i].friendly_name));
 			result.emplace_back(device);
 		}
 	}