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

Merge branch 'dev' into dev-0.11

Browse Source
This commit is contained in:
David Reid
2021-11-14 17:51:29 +10:00
parent 77cd309e0b c221402e9c
commit f225ae945c
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+4 -2
View File
@@ -24319,10 +24319,11 @@ static ma_result ma_context_enumerate_devices__alsa(ma_context* pContext, ma_enu
/* /*
Some devices are both playback and capture, but they are only enumerated by ALSA once. We need to fire the callback Some devices are both playback and capture, but they are only enumerated by ALSA once. We need to fire the callback
again for the other device type in this case. We do this for known devices. again for the other device type in this case. We do this for known devices and where the IOID hint is NULL, which
means both Input and Output.
*/ */
if (cbResult) { if (cbResult) {
if (ma_is_common_device_name__alsa(NAME)) { if (ma_is_common_device_name__alsa(NAME) || IOID == NULL) {
if (deviceType == ma_device_type_playback) { if (deviceType == ma_device_type_playback) {
if (!ma_is_capture_device_blacklisted__alsa(NAME)) { if (!ma_is_capture_device_blacklisted__alsa(NAME)) {
cbResult = callback(pContext, ma_device_type_capture, &deviceInfo, pUserData); cbResult = callback(pContext, ma_device_type_capture, &deviceInfo, pUserData);
@@ -87992,6 +87993,7 @@ REVISION HISTORY
================ ================
v0.10.43 - TBD v0.10.43 - TBD
- ALSA: Fix use of uninitialized variables - ALSA: Fix use of uninitialized variables
- ALSA: Fix enumeration of devices that support both playback and capture.
v0.10.42 - 2021-08-22 v0.10.42 - 2021-08-22
- Fix a possible deadlock when stopping devices. - Fix a possible deadlock when stopping devices.