gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set the number of audio devices to 0 if audio hasn't been initialized

Browse Source 
This updates GetAudioDevices() to have the same behavior as SDL_GetJoysticks() where the return value will only be NULL if there is an error. Returning no devices will return a valid array containing NULL.
This commit is contained in:
Sam Lantinga
2024-01-16 12:15:13 -08:00
parent be0ba78c56
commit 9408299bad
1 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/audio/SDL_audio.c
View File

@@ -1257,22 +1257,17 @@ static int SDLCALL CaptureAudioThread(void *devicep) // thread entry point
} }
static SDL_AudioDeviceID *GetAudioDevices(int *reqcount, SDL_bool iscapture) static SDL_AudioDeviceID *GetAudioDevices(int *count, SDL_bool iscapture)
{ {
if (!SDL_GetCurrentAudioDriver()) {
SDL_SetError("Audio subsystem is not initialized");
return NULL;
}
SDL_AudioDeviceID *retval = NULL; SDL_AudioDeviceID *retval = NULL;
int num_devices = 0;
if (SDL_GetCurrentAudioDriver()) {
SDL_LockRWLockForReading(current_audio.device_hash_lock); SDL_LockRWLockForReading(current_audio.device_hash_lock);
int num_devices = SDL_AtomicGet(iscapture ? &current_audio.capture_device_count : &current_audio.output_device_count); {
if (num_devices > 0) { num_devices = SDL_AtomicGet(iscapture ? &current_audio.capture_device_count : &current_audio.output_device_count);
retval = (SDL_AudioDeviceID *) SDL_malloc((num_devices + 1) * sizeof (SDL_AudioDeviceID)); retval = (SDL_AudioDeviceID *) SDL_malloc((num_devices + 1) * sizeof (SDL_AudioDeviceID));
if (!retval) { if (retval) {
num_devices = 0;
} else {
int devs_seen = 0; int devs_seen = 0;
const void *key; const void *key;
const void *value; const void *value;
@@ -1291,14 +1286,22 @@ static SDL_AudioDeviceID *GetAudioDevices(int *reqcount, SDL_bool iscapture)
SDL_assert(devs_seen == num_devices); SDL_assert(devs_seen == num_devices);
retval[devs_seen] = 0; // null-terminated. retval[devs_seen] = 0; // null-terminated.
} else {
SDL_OutOfMemory();
} }
} }
SDL_UnlockRWLock(current_audio.device_hash_lock); SDL_UnlockRWLock(current_audio.device_hash_lock);
} else {
if (reqcount) { SDL_SetError("Audio subsystem is not initialized");
*reqcount = num_devices;
} }
if (count) {
if (retval) {
*count = num_devices;
} else {
*count = 0;
}
}
return retval; return retval;
} }