mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-22 03:08:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

audio: fixed more "spec" references that should have been "callbackspec".

Browse Source 
This should catch all the ones for audio targets that have provided their
own audio threads.
This commit is contained in:
Ryan C. Gordon
2017-05-10 16:18:43 -04:00
parent 8b7ae35356
commit c878b59bbe
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/audio/emscripten/SDL_emscriptenaudio.c
View File

@@ -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. */
}
}
}