Fix engine not starting on Windows if linked against SDL > 2.0.5
[xonotic/darkplaces.git] / snd_sdl.c
index dae644d..21341dc 100644 (file)
--- a/snd_sdl.c
+++ b/snd_sdl.c
@@ -16,15 +16,16 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
-#include "quakedef.h"
-
 #include <math.h>
 #include <SDL.h>
 
+#include "quakedef.h"
+
 #include "snd_main.h"
 
 
 static unsigned int sdlaudiotime = 0;
+static int audio_device = 0;
 
 
 // Note: SDL calls SDL_LockAudio() right before this function, so no need to lock the audio data here
@@ -39,41 +40,47 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len)
 
        RequestedFrames = (unsigned int)len / factor;
 
-       if (snd_usethreadedmixing)
+       if (SndSys_LockRenderBuffer())
        {
-               S_MixToBuffer(stream, RequestedFrames);
-               if (snd_blocked)
-                       memset(stream, snd_renderbuffer->format.width == 1 ? 0x80 : 0, len);
-               return;
-       }
+               if (snd_usethreadedmixing)
+               {
+                       S_MixToBuffer(stream, RequestedFrames);
+                       if (snd_blocked)
+                               memset(stream, snd_renderbuffer->format.width == 1 ? 0x80 : 0, len);
+                       SndSys_UnlockRenderBuffer();
+                       return;
+               }
 
-       // Transfert up to a chunk of samples from snd_renderbuffer to stream
-       MaxFrames = snd_renderbuffer->endframe - snd_renderbuffer->startframe;
-       if (MaxFrames > RequestedFrames)
-               FrameCount = RequestedFrames;
-       else
-               FrameCount = MaxFrames;
-       StartOffset = snd_renderbuffer->startframe % snd_renderbuffer->maxframes;
-       EndOffset = (snd_renderbuffer->startframe + FrameCount) % snd_renderbuffer->maxframes;
-       if (StartOffset > EndOffset)  // if the buffer wraps
-       {
-               unsigned int PartialLength1, PartialLength2;
+               // Transfert up to a chunk of samples from snd_renderbuffer to stream
+               MaxFrames = snd_renderbuffer->endframe - snd_renderbuffer->startframe;
+               if (MaxFrames > RequestedFrames)
+                       FrameCount = RequestedFrames;
+               else
+                       FrameCount = MaxFrames;
+               StartOffset = snd_renderbuffer->startframe % snd_renderbuffer->maxframes;
+               EndOffset = (snd_renderbuffer->startframe + FrameCount) % snd_renderbuffer->maxframes;
+               if (StartOffset > EndOffset)  // if the buffer wraps
+               {
+                       unsigned int PartialLength1, PartialLength2;
 
-               PartialLength1 = (snd_renderbuffer->maxframes - StartOffset) * factor;
-               memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], PartialLength1);
+                       PartialLength1 = (snd_renderbuffer->maxframes - StartOffset) * factor;
+                       memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], PartialLength1);
 
-               PartialLength2 = FrameCount * factor - PartialLength1;
-               memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2);
-       }
-       else
-               memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor);
+                       PartialLength2 = FrameCount * factor - PartialLength1;
+                       memcpy(&stream[PartialLength1], &snd_renderbuffer->ring[0], PartialLength2);
+               }
+               else
+                       memcpy(stream, &snd_renderbuffer->ring[StartOffset * factor], FrameCount * factor);
+
+               snd_renderbuffer->startframe += FrameCount;
 
-       snd_renderbuffer->startframe += FrameCount;
+               if (FrameCount < RequestedFrames && developer_insane.integer && vid_activewindow)
+                       Con_DPrintf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount);
 
-       if (FrameCount < RequestedFrames && developer.integer >= 1000 && vid_activewindow)
-               Con_Printf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount);
+               sdlaudiotime += RequestedFrames;
 
-       sdlaudiotime += RequestedFrames;
+               SndSys_UnlockRenderBuffer();
+       }
 }
 
 
@@ -101,7 +108,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
                return false;
        }
 
-       buffersize = (unsigned int)ceil((double)requested->speed / 20.0);
+       buffersize = (unsigned int)ceil((double)requested->speed / 25.0); // 2048 bytes on 24kHz to 48kHz
 
        // Init the SDL Audio subsystem
        wantspec.callback = Buffer_Callback;
@@ -118,7 +125,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
                                "\tSamples   : %i\n",
                                wantspec.channels, wantspec.format, wantspec.freq, wantspec.samples);
 
-       if( SDL_OpenAudio( &wantspec, &obtainspec ) )
+       if ((audio_device = SDL_OpenAudioDevice(NULL, 0, &wantspec, &obtainspec, 0)) == 0)
        {
                Con_Printf( "Failed to open the audio device! (%s)\n", SDL_GetError() );
                return false;
@@ -136,7 +143,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
                wantspec.format != obtainspec.format ||
                wantspec.channels != obtainspec.channels)
        {
-               SDL_CloseAudio();
+               SDL_CloseAudioDevice(audio_device);
 
                // Pass the obtained format as a suggested format
                if (suggested != NULL)
@@ -154,19 +161,10 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 
        snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL);
        if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO)
-       {
-               int newlayout;
-
-#ifdef __linux__
-               newlayout = SND_CHANNELLAYOUT_ALSA;
-#else
-               newlayout = SND_CHANNELLAYOUT_STANDARD;
-#endif
-               Cvar_SetValueQuick (&snd_channellayout, newlayout);
-       }
+               Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_STANDARD);
 
        sdlaudiotime = 0;
-       SDL_PauseAudio( false );
+       SDL_PauseAudioDevice(audio_device, 0);
 
        return true;
 }
@@ -181,8 +179,10 @@ Stop the sound card, delete "snd_renderbuffer" and free its other resources
 */
 void SndSys_Shutdown(void)
 {
-       SDL_CloseAudio();
-
+       if (audio_device > 0) {
+               SDL_CloseAudioDevice(audio_device);
+               audio_device = 0;
+       }
        if (snd_renderbuffer != NULL)
        {
                Mem_Free(snd_renderbuffer->ring);
@@ -227,7 +227,7 @@ Get the exclusive lock on "snd_renderbuffer"
 */
 qboolean SndSys_LockRenderBuffer (void)
 {
-       SDL_LockAudio();
+       SDL_LockAudioDevice(audio_device);
        return true;
 }
 
@@ -241,5 +241,17 @@ Release the exclusive lock on "snd_renderbuffer"
 */
 void SndSys_UnlockRenderBuffer (void)
 {
-       SDL_UnlockAudio();
+       SDL_UnlockAudioDevice(audio_device);
+}
+
+/*
+====================
+SndSys_SendKeyEvents
+
+Send keyboard events originating from the sound system (e.g. MIDI)
+====================
+*/
+void SndSys_SendKeyEvents(void)
+{
+       // not supported
 }