Commits

Richard Goedeken committed eb37c03 Merge

merge heads

Comments (0)

Files changed (1)

         else
 #endif
         {
+#if SDL_VERSION_ATLEAST(1,3,0)
+#warning Mixing disabled with SDL >= 1.3 because it creates distorted audio
+            input_used = resample(primaryBuffer, buffer_pos, oldsamplerate, stream, len, newsamplerate);
+#else
             input_used = resample(primaryBuffer, buffer_pos, oldsamplerate, mixBuffer, len, newsamplerate);
             SDL_MixAudio(stream, mixBuffer, len, VolSDL);
+#endif
         }
         memmove(primaryBuffer, &primaryBuffer[input_used], buffer_pos - input_used);
         buffer_pos -= input_used;