src/audio/SDL_audio.c
changeset 8660 6bd1f8bad873
parent 8658 7939f33e81ac
child 8761 bce4122e6e87
     1.1 --- a/src/audio/SDL_audio.c	Thu Mar 20 17:55:24 2014 -0400
     1.2 +++ b/src/audio/SDL_audio.c	Thu Mar 20 18:00:41 2014 -0400
     1.3 @@ -243,6 +243,7 @@
     1.4  #undef FILL_STUB
     1.5  }
     1.6  
     1.7 +#if 0  /* !!! FIXME: rewrite/remove this streamer code. */
     1.8  /* Streaming functions (for when the input and output buffer sizes are different) */
     1.9  /* Write [length] bytes from buf into the streamer */
    1.10  static void
    1.11 @@ -302,6 +303,7 @@
    1.12  {
    1.13      SDL_free(stream->buffer);
    1.14  }
    1.15 +#endif
    1.16  
    1.17  #if defined(ANDROID)
    1.18  #include <android/log.h>
    1.19 @@ -317,9 +319,12 @@
    1.20      void *udata;
    1.21      void (SDLCALL * fill) (void *userdata, Uint8 * stream, int len);
    1.22      Uint32 delay;
    1.23 +
    1.24 +#if 0  /* !!! FIXME: rewrite/remove this streamer code. */
    1.25      /* For streaming when the buffer sizes don't match up */
    1.26      Uint8 *istream;
    1.27      int istream_len = 0;
    1.28 +#endif
    1.29  
    1.30      /* The audio mixing is always a high priority thread */
    1.31      SDL_SetThreadPriority(SDL_THREAD_PRIORITY_HIGH);
    1.32 @@ -456,8 +461,9 @@
    1.33              }
    1.34  
    1.35          }
    1.36 -    } else {
    1.37 +    } else
    1.38  #endif
    1.39 +    {
    1.40          /* Otherwise, do not use the streamer. This is the old code. */
    1.41          const int silence = (int) device->spec.silence;
    1.42  
    1.43 @@ -506,9 +512,7 @@
    1.44                  SDL_Delay(delay);
    1.45              }
    1.46          }
    1.47 -#if 0  /* !!! FIXME: rewrite/remove this streamer code. */
    1.48      }
    1.49 -#endif
    1.50  
    1.51      /* Wait for the audio to drain.. */
    1.52      current_audio.impl.WaitDone(device);