mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

audio: Enumerating audio devices will skip zombie devices still in the hash.

This commit is contained in:
Ryan C. Gordon 2025-06-20 17:36:51 -04:00
parent d06b6e42d2
commit eb04219efe
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/audio/SDL_audio.c
View File

@ -1415,6 +1415,7 @@ static int SDLCALL RecordingAudioThread(void *devicep) // thread entry point
typedef struct CountAudioDevicesData typedef struct CountAudioDevicesData
{ {
int devs_seen; int devs_seen;
int devs_skipped;
const int num_devices; const int num_devices;
SDL_AudioDeviceID *result; SDL_AudioDeviceID *result;
const bool recording; const bool recording;
@ -1430,8 +1431,14 @@ static bool SDLCALL CountAudioDevices(void *userdata, const SDL_HashTable *table
const bool isphysical = !!(devid & (1<<1)); const bool isphysical = !!(devid & (1<<1));
if (isphysical && (devid_recording == data->recording)) { if (isphysical && (devid_recording == data->recording)) {
SDL_assert(data->devs_seen < data->num_devices); SDL_assert(data->devs_seen < data->num_devices);
SDL_AudioDevice *device = (SDL_AudioDevice *) value; // this is normally risky, but we hold the device_hash_lock here.
const bool zombie = SDL_GetAtomicInt(&device->zombie) != 0;
if (zombie) {
data->devs_skipped++;
} else {
data->result[data->devs_seen++] = devid; data->result[data->devs_seen++] = devid;
} }
}
return true; // keep iterating. return true; // keep iterating.
} }
@ -1446,10 +1453,11 @@ static SDL_AudioDeviceID *GetAudioDevices(int *count, bool recording)
num_devices = SDL_GetAtomicInt(recording ? &current_audio.recording_device_count : &current_audio.playback_device_count); num_devices = SDL_GetAtomicInt(recording ? &current_audio.recording_device_count : &current_audio.playback_device_count);
result = (SDL_AudioDeviceID *) SDL_malloc((num_devices + 1) * sizeof (SDL_AudioDeviceID)); result = (SDL_AudioDeviceID *) SDL_malloc((num_devices + 1) * sizeof (SDL_AudioDeviceID));
if (result) { if (result) {
CountAudioDevicesData data = { 0, num_devices, result, recording }; CountAudioDevicesData data = { 0, 0, num_devices, result, recording };
SDL_IterateHashTable(current_audio.device_hash, CountAudioDevices, &data); SDL_IterateHashTable(current_audio.device_hash, CountAudioDevices, &data);
SDL_assert(data.devs_seen == num_devices); SDL_assert((data.devs_seen + data.devs_skipped) == num_devices);
result[data.devs_seen] = 0; // null-terminated. num_devices = data.devs_seen; // might be less if we skipped any.
result[num_devices] = 0; // null-terminated.
} }
} }
SDL_UnlockRWLock(current_audio.device_hash_lock); SDL_UnlockRWLock(current_audio.device_hash_lock);