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

audio(4): Update to the new device info system.

Browse Source
This commit is contained in:
David Reid
2026-01-15 17:21:08 +10:00
parent e0e26b5535
commit 06394e8e90
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+11 -10
View File
@@ -38236,7 +38236,7 @@ static ma_result ma_context_get_device_info_from_fd__audio4(int fd, int deviceIn
format = ma_format_from_encoding__audio4(encoding.encoding, encoding.precision); format = ma_format_from_encoding__audio4(encoding.encoding, encoding.precision);
if (format != ma_format_unknown) { if (format != ma_format_unknown) {
ma_device_info_add_native_data_format(pDeviceInfo, format, channels, sampleRate, 0); ma_device_info_add_native_data_format_2(pDeviceInfo, format, channels, channels, sampleRate, sampleRate);
} }
counter += 1; counter += 1;
@@ -38267,7 +38267,7 @@ static ma_result ma_context_get_device_info_from_fd__audio4(int fd, int deviceIn
sampleRate = fdPar.rate; sampleRate = fdPar.rate;
pDeviceInfo->nativeDataFormatCount = 0; pDeviceInfo->nativeDataFormatCount = 0;
ma_device_info_add_native_data_format(pDeviceInfo, format, channels, sampleRate, 0); ma_device_info_add_native_data_format_2(pDeviceInfo, format, channels, channels, sampleRate, sampleRate);
} }
#endif #endif
@@ -38397,19 +38397,16 @@ static ma_result ma_context_enumerate_devices__audio4(ma_context* pContext, ma_e
/* Formats. */ /* Formats. */
if (ioctl(audioctlFD, AUDIO_GETPAR, &audioPar) >= 0) { if (ioctl(audioctlFD, AUDIO_GETPAR, &audioPar) >= 0) {
deviceInfo.nativeDataFormats[deviceInfo.nativeDataFormatCount].format = ma_format_from_swpar__audio4(&audioPar);
deviceInfo.nativeDataFormats[deviceInfo.nativeDataFormatCount].channels = 0; /* Filled out below because it's reported as separate values for capture and playback. */
deviceInfo.nativeDataFormats[deviceInfo.nativeDataFormatCount].sampleRate = audioPar.rate;
deviceInfo.nativeDataFormatCount += 1;
}
/* We need to try opening the device to check if it's a playback or capture device. */ /* We need to try opening the device to check if it's a playback or capture device. */
if (!isTerminating) { if (!isTerminating) {
audioFD = open(devnode, O_WRONLY | O_NONBLOCK); audioFD = open(devnode, O_WRONLY | O_NONBLOCK);
if (audioFD >= 0) { if (audioFD >= 0) {
deviceInfo.nativeDataFormats[0].channels = audioPar.pchan; ma_device_info_add_native_data_format_2(&deviceInfo, ma_format_from_swpar__audio4(&audioPar), audioPar.pchan, audioPar.pchan, audioPar.rate, audioPar.rate);
{
isTerminating = (callback(ma_device_type_playback, &deviceInfo, pUserData) == MA_DEVICE_ENUMERATION_ABORT); isTerminating = (callback(ma_device_type_playback, &deviceInfo, pUserData) == MA_DEVICE_ENUMERATION_ABORT);
} }
deviceInfo.nativeDataFormatCount = 0; /* <-- Reset channels in case we do another iteration for the capture side. */
}
close(audioFD); close(audioFD);
} }
@@ -38417,12 +38414,16 @@ static ma_result ma_context_enumerate_devices__audio4(ma_context* pContext, ma_e
if (!isTerminating) { if (!isTerminating) {
audioFD = open(devnode, O_RDONLY | O_NONBLOCK); audioFD = open(devnode, O_RDONLY | O_NONBLOCK);
if (audioFD >= 0) { if (audioFD >= 0) {
deviceInfo.nativeDataFormats[0].channels = audioPar.rchan; ma_device_info_add_native_data_format_2(&deviceInfo, ma_format_from_swpar__audio4(&audioPar), audioPar.rchan, audioPar.rchan, audioPar.rate, audioPar.rate);
{
isTerminating = (callback(ma_device_type_capture, &deviceInfo, pUserData) == MA_DEVICE_ENUMERATION_ABORT); isTerminating = (callback(ma_device_type_capture, &deviceInfo, pUserData) == MA_DEVICE_ENUMERATION_ABORT);
} }
deviceInfo.nativeDataFormatCount = 0;
}
close(audioFD); close(audioFD);
} }
}
} else { } else {
/* AUDIO_GETDEV failed for audioctlN. */ /* AUDIO_GETDEV failed for audioctlN. */
ma_log_postf(ma_context_get_log(pContext), MA_LOG_LEVEL_DEBUG, "[audio4] AUDIO_GETDEV failed for %s.", devnodectl); ma_log_postf(ma_context_get_log(pContext), MA_LOG_LEVEL_DEBUG, "[audio4] AUDIO_GETDEV failed for %s.", devnodectl);