commit c5ad6d88b02018e9e91a6df0d4e47fa92d006bdc
author Juha Kuikka <juha.kuikka@synapse.com> Thu Apr 20 21:25:29 2017 -0400
committer Juha Kuikka <juha.kuikka@synapse.com> Thu Apr 20 21:25:29 2017 -0400
tree 64559f1a80bcef95d6ca59a2124ae9b44f8cf6fa
parent 510f935df158a4019224b3907f2eac4f59de9d91

audio: Fix audio queue functions to use new spec structure.

Using the old spec structure causes the audio queueing functions to fail
due to bad callback pointers being checked.

src/audio/SDL_audio.c

diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c
index a25865c..45d137d 100644
--- a/src/audio/SDL_audio.c
+++ b/src/audio/SDL_audio.c
@@ -556,7 +556,7 @@
         return -1;  /* get_audio_device() will have set the error state */
     } else if (device->iscapture) {
         return SDL_SetError("This is a capture device, queueing not allowed");
-    } else if (device->spec.callback != SDL_BufferQueueDrainCallback) {
+    } else if (device->callbackspec.callback != SDL_BufferQueueDrainCallback) {
         return SDL_SetError("Audio device has a callback, queueing not allowed");
     }
 
@@ -578,7 +578,7 @@
     if ( (len == 0) ||  /* nothing to do? */
          (!device) ||  /* called with bogus device id */
          (!device->iscapture) ||  /* playback devices can't dequeue */
-         (device->spec.callback != SDL_BufferQueueFillCallback) ) { /* not set for queueing */
+         (device->callbackspec.callback != SDL_BufferQueueFillCallback) ) { /* not set for queueing */
         return 0;  /* just report zero bytes dequeued. */
     }
 
@@ -599,11 +599,11 @@
     }
 
     /* Nothing to do unless we're set up for queueing. */
-    if (device->spec.callback == SDL_BufferQueueDrainCallback) {
+    if (device->callbackspec.callback == SDL_BufferQueueDrainCallback) {
         current_audio.impl.LockDevice(device);
         retval = ((Uint32) SDL_CountDataQueue(device->buffer_queue)) + current_audio.impl.GetPendingBytes(device);
         current_audio.impl.UnlockDevice(device);
-    } else if (device->spec.callback == SDL_BufferQueueFillCallback) {
+    } else if (device->callbackspec.callback == SDL_BufferQueueFillCallback) {
         current_audio.impl.LockDevice(device);
         retval = (Uint32) SDL_CountDataQueue(device->buffer_queue);
         current_audio.impl.UnlockDevice(device);