mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-24 01:04:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

audioio: Fix unnecessarily inefficient device enumeration.

Browse Source
This commit is contained in:
David Reid
2018-08-06 09:49:48 +00:00
parent af3f01ca6f
commit 2b167eb199
1 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mini_al.h
+35 -33
View File
@@ -15398,7 +15398,7 @@ mal_result mal_context_enumerate_devices__sndio(mal_context* pContext, mal_enum_
mal_itoa_s(iDevice, devpath+strlen(devpath), sizeof(devpath)-strlen(devpath), 10); mal_itoa_s(iDevice, devpath+strlen(devpath), sizeof(devpath)-strlen(devpath), 10);
struct stat st; struct stat st;
if (stat(devpath, &st) != 0) { if (stat(devpath, &st) < 0) {
break; break;
} }
@@ -16095,47 +16095,49 @@ mal_result mal_context_enumerate_devices__audioio(mal_context* pContext, mal_enu
mal_itoa_s(iDevice, devpath+strlen(devpath), sizeof(devpath)-strlen(devpath), 10); mal_itoa_s(iDevice, devpath+strlen(devpath), sizeof(devpath)-strlen(devpath), 10);
struct stat st; struct stat st;
if (stat(devpath, &st) == 0) { if (stat(devpath, &st) < 0) {
// The device exists, but we need to check if it's usable as playback and/or capture. break;
int fd; }
mal_bool32 isTerminating = MAL_FALSE;
// Playback. // The device exists, but we need to check if it's usable as playback and/or capture.
if (!isTerminating) { int fd;
fd = open(devpath, O_RDONLY, 0); mal_bool32 isTerminating = MAL_FALSE;
if (fd >= 0) {
// Supports playback.
mal_device_info deviceInfo;
mal_zero_object(&deviceInfo);
mal_construct_device_id__audioio(deviceInfo.id.audioio, sizeof(deviceInfo.id.audioio), "/dev/audio", iDevice);
if (mal_context_get_device_info_from_fd__audioio(pContext, mal_device_type_playback, fd, &deviceInfo) == MAL_SUCCESS) {
isTerminating = !callback(pContext, mal_device_type_playback, &deviceInfo, pUserData);
}
close(fd); // Playback.
if (!isTerminating) {
fd = open(devpath, O_RDONLY, 0);
if (fd >= 0) {
// Supports playback.
mal_device_info deviceInfo;
mal_zero_object(&deviceInfo);
mal_construct_device_id__audioio(deviceInfo.id.audioio, sizeof(deviceInfo.id.audioio), "/dev/audio", iDevice);
if (mal_context_get_device_info_from_fd__audioio(pContext, mal_device_type_playback, fd, &deviceInfo) == MAL_SUCCESS) {
isTerminating = !callback(pContext, mal_device_type_playback, &deviceInfo, pUserData);
} }
close(fd);
} }
}
// Capture. // Capture.
if (!isTerminating) { if (!isTerminating) {
fd = open(devpath, O_WRONLY, 0); fd = open(devpath, O_WRONLY, 0);
if (fd >= 0) { if (fd >= 0) {
// Supports capture. // Supports capture.
mal_device_info deviceInfo; mal_device_info deviceInfo;
mal_zero_object(&deviceInfo); mal_zero_object(&deviceInfo);
mal_construct_device_id__audioio(deviceInfo.id.audioio, sizeof(deviceInfo.id.audioio), "/dev/audio", iDevice); mal_construct_device_id__audioio(deviceInfo.id.audioio, sizeof(deviceInfo.id.audioio), "/dev/audio", iDevice);
if (mal_context_get_device_info_from_fd__audioio(pContext, mal_device_type_capture, fd, &deviceInfo) == MAL_SUCCESS) { if (mal_context_get_device_info_from_fd__audioio(pContext, mal_device_type_capture, fd, &deviceInfo) == MAL_SUCCESS) {
isTerminating = !callback(pContext, mal_device_type_capture, &deviceInfo, pUserData); isTerminating = !callback(pContext, mal_device_type_capture, &deviceInfo, pUserData);
}
close(fd);
} }
}
if (isTerminating) { close(fd);
break;
} }
} }
if (isTerminating) {
break;
}
} }
return MAL_SUCCESS; return MAL_SUCCESS;