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

wasapi: Reference devices when proxying to management thread. 

Otherwise, a disconnect/default change on another thread may cause the
device pointer to become invalid by the time the management thread runs the
task.
main
Ryan C. Gordon 2023-11-14 16:18:38 -05:00
parent 34392db9c3
commit a58af6d0d1
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/audio/wasapi/SDL_wasapi_win32.c
View File

@ -50,26 +50,36 @@ static const IID SDL_IID_IAudioClient = { 0x1cb9ad4c, 0xdbfa, 0x4c32, { 0xb1, 0x
static int mgmtthrtask_AudioDeviceDisconnected(void *userdata) static int mgmtthrtask_AudioDeviceDisconnected(void *userdata)
{ {
SDL_AudioDeviceDisconnected((SDL_AudioDevice *)userdata); SDL_AudioDevice *device = (SDL_AudioDevice *) userdata;
SDL_AudioDeviceDisconnected(device);
UnrefPhysicalAudioDevice(device); // make sure this lived until the task completes.
return 0; return 0;
} }
static void WASAPI_AudioDeviceDisconnected(SDL_AudioDevice *device) static void WASAPI_AudioDeviceDisconnected(SDL_AudioDevice *device)
{ {
// don't wait on this, IMMDevice's own thread needs to return or everything will deadlock. // don't wait on this, IMMDevice's own thread needs to return or everything will deadlock.
WASAPI_ProxyToManagementThread(mgmtthrtask_AudioDeviceDisconnected, device, NULL); if (device) {
RefPhysicalAudioDevice(device); // make sure this lives until the task completes.
WASAPI_ProxyToManagementThread(mgmtthrtask_AudioDeviceDisconnected, device, NULL);
}
} }
static int mgmtthrtask_DefaultAudioDeviceChanged(void *userdata) static int mgmtthrtask_DefaultAudioDeviceChanged(void *userdata)
{ {
SDL_DefaultAudioDeviceChanged((SDL_AudioDevice *) userdata); SDL_AudioDevice *device = (SDL_AudioDevice *) userdata;
SDL_DefaultAudioDeviceChanged(device);
UnrefPhysicalAudioDevice(device); // make sure this lived until the task completes.
return 0; return 0;
} }
static void WASAPI_DefaultAudioDeviceChanged(SDL_AudioDevice *new_default_device) static void WASAPI_DefaultAudioDeviceChanged(SDL_AudioDevice *new_default_device)
{ {
// don't wait on this, IMMDevice's own thread needs to return or everything will deadlock. // don't wait on this, IMMDevice's own thread needs to return or everything will deadlock.
WASAPI_ProxyToManagementThread(mgmtthrtask_DefaultAudioDeviceChanged, new_default_device, NULL); if (new_default_device) {
RefPhysicalAudioDevice(new_default_device); // make sure this lives until the task completes.
WASAPI_ProxyToManagementThread(mgmtthrtask_DefaultAudioDeviceChanged, new_default_device, NULL);
}
} }
int WASAPI_PlatformInit(void) int WASAPI_PlatformInit(void)