encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Backed out a very unsafe change that was trying to prevent audio hang at quit. 

Ryan and I have ideas on a better way to handle this.
This commit is contained in:
Sam Lantinga 2016-10-05 00:12:16 -07:00
parent bac61096d8
commit 9257b72d53
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/audio/SDL_audio.c
View File

@ -1066,10 +1066,6 @@ close_audio_device(SDL_AudioDevice * device)
{ {
SDL_AtomicSet(&device->shutdown, 1); SDL_AtomicSet(&device->shutdown, 1);
SDL_AtomicSet(&device->enabled, 0); SDL_AtomicSet(&device->enabled, 0);
if (device->hidden != NULL) {
current_audio.impl.CloseDevice(device);
}
if (device->thread != NULL) { if (device->thread != NULL) {
SDL_WaitThread(device->thread, NULL); SDL_WaitThread(device->thread, NULL);
} }
@ -1080,6 +1076,9 @@ close_audio_device(SDL_AudioDevice * device)
if (device->convert.needed) { if (device->convert.needed) {
SDL_free(device->convert.buf); SDL_free(device->convert.buf);
} }
if (device->hidden != NULL) {
current_audio.impl.CloseDevice(device);
}
free_audio_queue(device->buffer_queue_head); free_audio_queue(device->buffer_queue_head);
free_audio_queue(device->buffer_queue_pool); free_audio_queue(device->buffer_queue_pool);