From ba4b3aa944c356ad1b2d4f91fb939549b17a9a45 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 20 Mar 2014 18:00:41 -0400 Subject: [PATCH] Patched to compile on C89 compilers, removed more streamer code. --- src/audio/SDL_audio.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c index a7dc7fc9c..c26b86550 100644 --- a/src/audio/SDL_audio.c +++ b/src/audio/SDL_audio.c @@ -243,6 +243,7 @@ finalize_audio_entry_points(void) #undef FILL_STUB } +#if 0 /* !!! FIXME: rewrite/remove this streamer code. */ /* Streaming functions (for when the input and output buffer sizes are different) */ /* Write [length] bytes from buf into the streamer */ static void @@ -302,6 +303,7 @@ SDL_StreamDeinit(SDL_AudioStreamer * stream) { SDL_free(stream->buffer); } +#endif #if defined(ANDROID) #include @@ -317,9 +319,12 @@ SDL_RunAudio(void *devicep) void *udata; void (SDLCALL * fill) (void *userdata, Uint8 * stream, int len); Uint32 delay; + +#if 0 /* !!! FIXME: rewrite/remove this streamer code. */ /* For streaming when the buffer sizes don't match up */ Uint8 *istream; int istream_len = 0; +#endif /* The audio mixing is always a high priority thread */ SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH); @@ -456,8 +461,9 @@ SDL_RunAudio(void *devicep) } } - } else { + } else #endif + { /* Otherwise, do not use the streamer. This is the old code. */ const int silence = (int) device->spec.silence; @@ -506,9 +512,7 @@ SDL_RunAudio(void *devicep) SDL_Delay(delay); } } -#if 0 /* !!! FIXME: rewrite/remove this streamer code. */ } -#endif /* Wait for the audio to drain.. */ current_audio.impl.WaitDone(device);