Commit c754662dda0d9c5698e7ebb5f8dfafc8efa914e4
2016-08-01T11:45:45
audio: Make SDL_AudioDevice::shutdown an atomic value. Just to make sure this get communicated to the audio thread properly.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index eb1dd5e..b7dab5c 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -103,7 +103,7 @@ static const AudioBootStrap *const bootstrap[] = {
&ESD_bootstrap,
#endif
#if SDL_AUDIO_DRIVER_NACL
- &NACLAUD_bootstrap,
+ &NACLAUD_bootstrap,
#endif
#if SDL_AUDIO_DRIVER_NAS
&NAS_bootstrap,
@@ -611,7 +611,7 @@ SDL_RunAudio(void *devicep)
current_audio.impl.ThreadInit(device);
/* Loop, filling the audio buffers */
- while (!device->shutdown) {
+ while (!SDL_AtomicGet(&device->shutdown)) {
/* Fill the current buffer with sound */
if (device->convert.needed) {
stream = device->convert.buf;
@@ -874,7 +874,7 @@ static void
close_audio_device(SDL_AudioDevice * device)
{
device->enabled = 0;
- device->shutdown = 1;
+ SDL_AtomicSet(&device->shutdown, 1);
if (device->thread != NULL) {
SDL_WaitThread(device->thread, NULL);
}
diff --git a/src/audio/SDL_sysaudio.h b/src/audio/SDL_sysaudio.h
index 426a190..3fb4c5c 100644
--- a/src/audio/SDL_sysaudio.h
+++ b/src/audio/SDL_sysaudio.h
@@ -157,10 +157,10 @@ struct SDL_AudioDevice
SDL_AudioStreamer streamer;
/* Current state flags */
- /* !!! FIXME: should be SDL_bool */
+ SDL_atomic_t shutdown; /* true if we are signaling the play thread to end. */
+ /* !!! FIXME: these should be SDL_bool */
int iscapture;
int enabled; /* true if device is functioning and connected. */
- int shutdown; /* true if we are signaling the play thread to end. */
int paused;
int opened;