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

API CHANGE: Change return type of device enumeration callback.

Browse Source 
The callback passed into `ma_context_enumerate_devices()` would
previously return a boolean, with true telling miniaudio to continue
enumeration, and false to abort. This got a bit confusing to read at
times, so I've decided to make this more explicit.

The new return type is an enum called `ma_device_enumeration_result`.
Instead of returning true to continue enumeration, the new return value
is `MA_DEVICE_ENUMERATION_CONTINUE`. Similarly, instead of returning
false to abort enumeration, `MA_DEVICE_ENUMERATION_ABORT` should be
returned instead.
This commit is contained in:
David Reid
2025-07-21 11:33:15 +10:00
parent 5d86a6ef82
commit 2b81f75cca
3 changed files with 106 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extras/backends/sdl/backend_sdl.c
+5 -8
View File
@@ -292,14 +292,13 @@ static void ma_add_native_format_from_AudioSpec__sdl(ma_device_info* pDeviceInfo
static ma_result ma_context_enumerate_devices__sdl(ma_context* pContext, ma_enum_devices_callback_proc callback, void* pCallbackUserData)
{
ma_context_state_sdl* pContextStateSDL = ma_context_get_backend_state__sdl(pContext);
ma_bool32 isTerminated = MA_FALSE;
ma_bool32 cbResult;
ma_device_enumeration_result cbResult = MA_DEVICE_ENUMERATION_CONTINUE;
int iDevice;
MA_SDL_ASSERT(pContextStateSDL != NULL);
/* Playback */
if (!isTerminated) {
if (cbResult == MA_DEVICE_ENUMERATION_CONTINUE) {
int deviceCount = pContextStateSDL->SDL_GetNumAudioDevices(0);
for (iDevice = 0; iDevice < deviceCount; ++iDevice) {
ma_device_info deviceInfo;
@@ -324,15 +323,14 @@ static ma_result ma_context_enumerate_devices__sdl(ma_context* pContext, ma_enum
}
cbResult = callback(ma_device_type_playback, &deviceInfo, pCallbackUserData);
if (cbResult == MA_FALSE) {
isTerminated = MA_TRUE;
if (cbResult == MA_DEVICE_ENUMERATION_ABORT) {
break;
}
}
}
/* Capture */
if (!isTerminated) {
if (cbResult == MA_DEVICE_ENUMERATION_CONTINUE) {
int deviceCount = pContextStateSDL->SDL_GetNumAudioDevices(1);
for (iDevice = 0; iDevice < deviceCount; ++iDevice) {
ma_device_info deviceInfo;
@@ -357,8 +355,7 @@ static ma_result ma_context_enumerate_devices__sdl(ma_context* pContext, ma_enum
}
cbResult = callback(ma_device_type_capture, &deviceInfo, pCallbackUserData);
if (cbResult == MA_FALSE) {
isTerminated = MA_TRUE;
if (cbResult == MA_DEVICE_ENUMERATION_ABORT) {
break;
}
}