fix motionblur cvar descriptions, also: First commit! :D

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index e4a4934a2993458f8044e4bbd6e51e2fa3e00de8..0bd242cc0940090cdae61851fcb5ece2383b1993 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -168,7 +168,7 @@ cvar_t snd_spatialization_power = {CVAR_SAVE, "snd_spatialization_power", "0", "
 cvar_t snd_spatialization_control = {CVAR_SAVE, "snd_spatialization_control", "0", "enable spatialization control (headphone friendly mode)"};
 
 // Cvars declared in snd_main.h (shared with other snd_*.c files)
-cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.1", "how much sound to mix ahead of time"};
+cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.11", "how much sound to mix ahead of time"};
 cvar_t snd_streaming = { CVAR_SAVE, "snd_streaming", "1", "enables keeping compressed ogg sound files compressed, decompressing them only as needed, otherwise they will be decompressed completely at load (may use a lot of memory)"};
 cvar_t snd_swapstereo = {CVAR_SAVE, "snd_swapstereo", "0", "swaps left/right speakers for old ISA soundblaster cards"};
 extern cvar_t v_flipped;
@@ -1476,17 +1476,18 @@ void S_StopChannel (unsigned int channel_ind, qboolean lockmutex)
        if (channel_ind >= total_channels)
                return;
 
+       // we have to lock an audio mutex to prevent crashes if an audio mixer
+       // thread is currently mixing this channel
+       // the SndSys_LockRenderBuffer function uses such a mutex in
+       // threaded sound backends
+       if (lockmutex && !simsound)
+               SndSys_LockRenderBuffer();
+       
        ch = &channels[channel_ind];
        if (ch->sfx != NULL)
        {
                sfx_t *sfx = ch->sfx;
 
-               // we have to lock an audio mutex to prevent crashes if an audio mixer
-               // thread is currently mixing this channel
-               // the SndSys_LockRenderBuffer function uses such a mutex in
-               // threaded sound backends
-               if (lockmutex)
-                       SndSys_LockRenderBuffer();
                if (sfx->fetcher != NULL)
                {
                        snd_fetcher_endsb_t fetcher_endsb = sfx->fetcher->endsb;
@@ -1499,9 +1500,9 @@ void S_StopChannel (unsigned int channel_ind, qboolean lockmutex)
 
                ch->fetcher_data = NULL;
                ch->sfx = NULL;
-               if (lockmutex)
-                       SndSys_UnlockRenderBuffer();
        }
+       if (lockmutex && !simsound)
+               SndSys_UnlockRenderBuffer();
 }
 
 
@@ -1548,18 +1549,18 @@ void S_StopAllSounds (void)
        // stop CD audio because it may be using a faketrack
        CDAudio_Stop();
 
-       for (i = 0; i < total_channels; i++)
-               S_StopChannel (i, true);
-
-       total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS;   // no statics
-       memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
-
-       // Mute the contents of the submittion buffer
        if (simsound || SndSys_LockRenderBuffer ())
        {
                int clear;
                size_t memsize;
 
+               for (i = 0; i < total_channels; i++)
+                       S_StopChannel (i, false);
+
+               total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS;   // no statics
+               memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
+
+               // Mute the contents of the submittion buffer
                clear = (snd_renderbuffer->format.width == 1) ? 0x80 : 0;
                memsize = snd_renderbuffer->maxframes * snd_renderbuffer->format.width * snd_renderbuffer->format.channels;
                memset(snd_renderbuffer->ring, clear, memsize);