dahjah/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2026-06-03 14:14:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

improved device detection

Browse Source
This commit is contained in:
georgemoralis 2026-02-13 10:11:56 +02:00
parent b55ac3bb64
commit 0074cf27ea
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/core/libraries/audio/openal_manager.h
View File

@ -72,21 +72,27 @@ public:
static std::vector<std::string> GetAvailableDevices() { static std::vector<std::string> GetAvailableDevices() {
std::vector<std::string> devices_list; std::vector<std::string> devices_list;
if (!IsDeviceEnumerationSupported()) { // Check if enumeration extension is supported
if (!alcIsExtensionPresent(nullptr, "ALC_ENUMERATION_EXT"))
return devices_list; return devices_list;
// Prefer ALC_ENUMERATE_ALL_EXT if available (OpenAL Soft)
const ALCchar* devices = nullptr;
if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT")) {
devices = alcGetString(nullptr, ALC_ALL_DEVICES_SPECIFIER);
} else {
devices = alcGetString(nullptr, ALC_DEVICE_SPECIFIER);
} }
// Get device list if (!devices)
const ALCchar* devices = alcGetString(nullptr, ALC_DEVICE_SPECIFIER);
if (!devices) {
return devices_list; return devices_list;
}
// Parse null-separated list // Parse double-null terminated list
const ALCchar* ptr = devices; const ALCchar* ptr = devices;
while (ptr && *ptr) { while (*ptr != '\0') {
devices_list.emplace_back(ptr); devices_list.emplace_back(ptr);
ptr += strlen(ptr) + 1; ptr += std::strlen(ptr) + 1;
} }
return devices_list; return devices_list;
@ -135,7 +141,14 @@ private:
} }
// Get actual device name // Get actual device name
const ALCchar* actual_name = alcGetString(device, ALC_DEVICE_SPECIFIER); const ALCchar* actual_name = nullptr;
// Check if ENUMERATE_ALL is supported
if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT")) {
actual_name = alcGetString(device, ALC_ALL_DEVICES_SPECIFIER);
} else {
actual_name = alcGetString(device, ALC_DEVICE_SPECIFIER);
}
current_device_name = actual_name ? actual_name : "Unknown"; current_device_name = actual_name ? actual_name : "Unknown";
initialized = true; initialized = true;