geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

audio: Another attempt to deal with device destruction from device thread. 

This only happens when closing a device from an event watcher, when the
device reports failure from its own thread.
main
Ryan C. Gordon 2023-10-22 17:01:49 -04:00
parent 33c9eeec7c
commit 9abc692156
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/audio/SDL_audio.c
View File

@ -1321,9 +1321,14 @@ int SDL_GetAudioDeviceFormat(SDL_AudioDeviceID devid, SDL_AudioSpec *spec, int *
// this expects the device lock to be held. !!! FIXME: no it doesn't...?
static void ClosePhysicalAudioDevice(SDL_AudioDevice *device)
{
SDL_AtomicSet(&device->shutdown, 1);
SDL_AtomicSet(&device->shutdown, 1); // alert device thread that it should terminate.
if (device->thread != NULL) {
SDL_WaitThread(device->thread, NULL);
if (SDL_GetThreadID(device->thread) == SDL_ThreadID()) {
SDL_DetachThread(device->thread); // we _are_ the device thread, just drift off into the ether when finished, nothing is waiting for us.
} else {
SDL_WaitThread(device->thread, NULL); // we're not the device thread, wait for it to terminate.
}
device->thread = NULL;
}
@ -1345,7 +1350,6 @@ static void ClosePhysicalAudioDevice(SDL_AudioDevice *device)
SDL_copyp(&device->spec, &device->default_spec);
device->sample_frames = 0;
device->silence_value = SDL_GetSilenceValueForFormat(device->spec.format);
SDL_AtomicSet(&device->shutdown, 0); // ready to go again.
}
void SDL_CloseAudioDevice(SDL_AudioDeviceID devid)
@ -1442,6 +1446,8 @@ static int OpenPhysicalAudioDevice(SDL_AudioDevice *device, const SDL_AudioSpec
return 0; // Braaaaaaaaains.
}
SDL_AtomicSet(&device->shutdown, 0); // make sure we don't kill the new thread immediately.
// These start with the backend's implementation, but we might swap them out with zombie versions later.
device->WaitDevice = current_audio.impl.WaitDevice;
device->PlayDevice = current_audio.impl.PlayDevice;