Add an in_releaseall command for debugging/working around stuck keys.

[xonotic/darkplaces.git] / snd_sdl.c

diff --git a/snd_sdl.c b/snd_sdl.c
index d30431c5a2f33dae4af7f88eb8e3d23a0e1172c3..583ea1f8b3b00d767f61abab2a2f836bf8f86bf4 100644 (file)
--- a/snd_sdl.c
+++ b/snd_sdl.c
@@ -16,11 +16,11 @@ 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 <math.h>
 #include <SDL.h>
 
 #include "quakedef.h"
+
 #include "snd_main.h"
 
 
@@ -38,34 +38,48 @@ static void Buffer_Callback (void *userdata, Uint8 *stream, int len)
                Sys_Error("SDL sound: invalid buffer length passed to Buffer_Callback (%d bytes)\n", len);
 
        RequestedFrames = (unsigned int)len / factor;
-       
-       // 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
+
+       if (SndSys_LockRenderBuffer())
        {
-               unsigned int PartialLength1, PartialLength2;
+               if (snd_usethreadedmixing)
+               {
+                       S_MixToBuffer(stream, RequestedFrames);
+                       if (snd_blocked)
+                               memset(stream, snd_renderbuffer->format.width == 1 ? 0x80 : 0, len);
+                       SndSys_UnlockRenderBuffer();
+                       return;
+               }
 
-               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);
+               // 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);
+
+                       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 >= 100)
-               Con_DPrintf("SDL sound: %u sample frames missing\n", RequestedFrames - FrameCount);
+               sdlaudiotime += RequestedFrames;
 
-       sdlaudiotime += RequestedFrames;
+               SndSys_UnlockRenderBuffer();
+       }
 }
 
 
@@ -83,7 +97,9 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
        SDL_AudioSpec wantspec;
        SDL_AudioSpec obtainspec;
 
-       Con_Print ("SndSys_Init: using the SDL module\n");
+       snd_threaded = false;
+
+       Con_DPrint ("SndSys_Init: using the SDL module\n");
 
        // Init the SDL Audio subsystem
        if( SDL_InitSubSystem( SDL_INIT_AUDIO ) ) {
@@ -91,7 +107,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;
@@ -101,7 +117,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
        wantspec.channels = requested->channels;
        wantspec.samples = CeilPowerOf2(buffersize);  // needs to be a power of 2 on some platforms.
 
-       Con_DPrintf("Wanted audio Specification:\n"
+       Con_Printf("Wanted audio Specification:\n"
                                "\tChannels  : %i\n"
                                "\tFormat    : 0x%X\n"
                                "\tFrequency : %i\n"
@@ -109,12 +125,12 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
                                wantspec.channels, wantspec.format, wantspec.freq, wantspec.samples);
 
        if( SDL_OpenAudio( &wantspec, &obtainspec ) )
-       {       
+       {
                Con_Printf( "Failed to open the audio device! (%s)\n", SDL_GetError() );
                return false;
        }
 
-       Con_DPrintf("Obtained audio specification:\n"
+       Con_Printf("Obtained audio specification:\n"
                                "\tChannels  : %i\n"
                                "\tFormat    : 0x%X\n"
                                "\tFrequency : %i\n"
@@ -140,13 +156,15 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
                return false;
        }
 
+       snd_threaded = true;
+
        snd_renderbuffer = Snd_CreateRingBuffer(requested, 0, NULL);
        if (snd_channellayout.integer == SND_CHANNELLAYOUT_AUTO)
-               Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_ALSA);
+               Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_STANDARD);
 
        sdlaudiotime = 0;
        SDL_PauseAudio( false );
-       
+
        return true;
 }
 
@@ -222,3 +240,15 @@ void SndSys_UnlockRenderBuffer (void)
 {
        SDL_UnlockAudio();
 }
+
+/*
+====================
+SndSys_SendKeyEvents
+
+Send keyboard events originating from the sound system (e.g. MIDI)
+====================
+*/
+void SndSys_SendKeyEvents(void)
+{
+       // not supported
+}