From c878b59bbee5c90fb4b38931309e0cedd534c9fd Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 10 May 2017 16:18:43 -0400 Subject: [PATCH] audio: fixed more "spec" references that should have been "callbackspec". This should catch all the ones for audio targets that have provided their own audio threads. --- src/audio/coreaudio/SDL_coreaudio.m | 4 ++-- src/audio/emscripten/SDL_emscriptenaudio.c | 12 ++++++------ src/audio/haiku/SDL_haikuaudio.cc | 6 +++--- src/audio/nacl/SDL_naclaudio.c | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/audio/coreaudio/SDL_coreaudio.m b/src/audio/coreaudio/SDL_coreaudio.m index 32b9d9ba89b33..a1c3736cb9487 100644 --- a/src/audio/coreaudio/SDL_coreaudio.m +++ b/src/audio/coreaudio/SDL_coreaudio.m @@ -412,7 +412,7 @@ static BOOL update_audio_session(_THIS, SDL_bool open) if (this->hidden->bufferOffset >= this->hidden->bufferSize) { /* Generate the data */ SDL_LockMutex(this->mixer_lock); - (*this->spec.callback)(this->spec.userdata, + (*this->callbackspec.callback)(this->callbackspec.userdata, this->hidden->buffer, this->hidden->bufferSize); SDL_UnlockMutex(this->mixer_lock); this->hidden->bufferOffset = 0; @@ -459,7 +459,7 @@ static BOOL update_audio_session(_THIS, SDL_bool open) if (this->hidden->bufferOffset >= this->hidden->bufferSize) { SDL_LockMutex(this->mixer_lock); - (*this->spec.callback)(this->spec.userdata, this->hidden->buffer, this->hidden->bufferSize); + (*this->callbackspec.callback)(this->callbackspec.userdata, this->hidden->buffer, this->hidden->bufferSize); SDL_UnlockMutex(this->mixer_lock); this->hidden->bufferOffset = 0; } diff --git a/src/audio/emscripten/SDL_emscriptenaudio.c b/src/audio/emscripten/SDL_emscriptenaudio.c index 8d09c3f88c453..b77224904a069 100644 --- a/src/audio/emscripten/SDL_emscriptenaudio.c +++ b/src/audio/emscripten/SDL_emscriptenaudio.c @@ -52,7 +52,7 @@ FeedAudioDevice(_THIS, const void *buf, const int buflen) static void HandleAudioProcess(_THIS) { - SDL_AudioCallback callback = this->spec.callback; + SDL_AudioCallback callback = this->callbackspec.callback; const int stream_len = this->callbackspec.size; /* Only do something if audio is enabled */ @@ -65,11 +65,11 @@ HandleAudioProcess(_THIS) if (this->stream == NULL) { /* no conversion necessary. */ SDL_assert(this->spec.size == stream_len); - callback(this->spec.userdata, this->work_buffer, stream_len); + callback(this->callbackspec.userdata, this->work_buffer, stream_len); } else { /* streaming/converting */ int got; while (SDL_AudioStreamAvailable(this->stream) < ((int) this->spec.size)) { - callback(this->spec.userdata, this->work_buffer, stream_len); + callback(this->callbackspec.userdata, this->work_buffer, stream_len); if (SDL_AudioStreamPut(this->stream, this->work_buffer, stream_len) == -1) { SDL_AudioStreamClear(this->stream); SDL_AtomicSet(&this->enabled, 0); @@ -90,7 +90,7 @@ HandleAudioProcess(_THIS) static void HandleCaptureProcess(_THIS) { - SDL_AudioCallback callback = this->spec.callback; + SDL_AudioCallback callback = this->callbackspec.callback; const int stream_len = this->callbackspec.size; /* Only do something if audio is enabled */ @@ -123,7 +123,7 @@ HandleCaptureProcess(_THIS) if (this->stream == NULL) { /* no conversion necessary. */ SDL_assert(this->spec.size == stream_len); - callback(this->spec.userdata, this->work_buffer, stream_len); + callback(this->callbackspec.userdata, this->work_buffer, stream_len); } else { /* streaming/converting */ if (SDL_AudioStreamPut(this->stream, this->work_buffer, this->spec.size) == -1) { SDL_AtomicSet(&this->enabled, 0); @@ -135,7 +135,7 @@ HandleCaptureProcess(_THIS) if (got != stream_len) { SDL_memset(this->work_buffer, this->callbackspec.silence, stream_len); } - callback(this->spec.userdata, this->work_buffer, stream_len); /* Send it to the app. */ + callback(this->callbackspec.userdata, this->work_buffer, stream_len); /* Send it to the app. */ } } } diff --git a/src/audio/haiku/SDL_haikuaudio.cc b/src/audio/haiku/SDL_haikuaudio.cc index 1b0db6be851c4..96a7dd797af43 100644 --- a/src/audio/haiku/SDL_haikuaudio.cc +++ b/src/audio/haiku/SDL_haikuaudio.cc @@ -48,7 +48,7 @@ FillSound(void *device, void *stream, size_t len, const media_raw_audio_format & format) { SDL_AudioDevice *audio = (SDL_AudioDevice *) device; - SDL_AudioCallback callback = audio->spec.callback; + SDL_AudioCallback callback = audio->callbackspec.callback; /* Only do something if audio is enabled */ if (!SDL_AtomicGet(&audio->enabled) || SDL_AtomicGet(&audio->paused)) { @@ -63,13 +63,13 @@ FillSound(void *device, void *stream, size_t len, if (audio->stream == NULL) { /* no conversion necessary. */ SDL_LockMutex(audio->mixer_lock); - callback(audio->spec.userdata, (Uint8 *) stream, len); + callback(audio->callbackspec.userdata, (Uint8 *) stream, len); SDL_UnlockMutex(audio->mixer_lock); } else { /* streaming/converting */ const int stream_len = audio->callbackspec.size; const int ilen = (int) len; while (SDL_AudioStreamAvailable(audio->stream) < ilen) { - callback(audio->spec.userdata, audio->work_buffer, stream_len); + callback(audio->callbackspec.userdata, audio->work_buffer, stream_len); if (SDL_AudioStreamPut(audio->stream, audio->work_buffer, stream_len) == -1) { SDL_AudioStreamClear(audio->stream); SDL_AtomicSet(&audio->enabled, 0); diff --git a/src/audio/nacl/SDL_naclaudio.c b/src/audio/nacl/SDL_naclaudio.c index 5b3b429f48784..abbaf1db50faa 100644 --- a/src/audio/nacl/SDL_naclaudio.c +++ b/src/audio/nacl/SDL_naclaudio.c @@ -48,7 +48,7 @@ static void nacl_audio_callback(void* samples, uint32_t buffer_size, PP_TimeDelt static void nacl_audio_callback(void* stream, uint32_t buffer_size, PP_TimeDelta latency, void* data) { const int len = (int) buffer_size; SDL_AudioDevice* _this = (SDL_AudioDevice*) data; - SDL_AudioCallback callback = _this->spec.callback; + SDL_AudioCallback callback = _this->callbackspec.callback; SDL_LockMutex(private->mutex); /* !!! FIXME: is this mutex necessary? */ @@ -65,12 +65,12 @@ static void nacl_audio_callback(void* stream, uint32_t buffer_size, PP_TimeDelta if (_this->stream == NULL) { /* no conversion necessary. */ SDL_LockMutex(_this->mixer_lock); - callback(_this->spec.userdata, stream, len); + callback(_this->callbackspec.userdata, stream, len); SDL_UnlockMutex(_this->mixer_lock); } else { /* streaming/converting */ const int stream_len = _this->callbackspec.size; while (SDL_AudioStreamAvailable(_this->stream) < len) { - callback(_this->spec.userdata, _this->work_buffer, stream_len); + callback(_this->callbackspec.userdata, _this->work_buffer, stream_len); if (SDL_AudioStreamPut(_this->stream, _this->work_buffer, stream_len) == -1) { SDL_AudioStreamClear(_this->stream); SDL_AtomicSet(&_this->enabled, 0);