Fixed the sliders and the toggles in the options menu

[xonotic/darkplaces.git] / snd_dma.c

diff --git a/snd_dma.c b/snd_dma.c
index 01e48254e40049b73f734bdbec91995acb982c08..9a66309b64b039b7e022fb453d28c040ba2a54e2 100644 (file)
--- a/snd_dma.c
+++ b/snd_dma.c
@@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
-#ifdef _WIN32
+#ifdef USE_DSOUND
 #include <windows.h>
 #include <dsound.h>
 extern DWORD gSndBufSize;
@@ -210,8 +210,6 @@ void S_Init(void)
 {
        Con_DPrint("\nSound Initialization\n");
 
-       S_RawSamples_ClearQueue();
-
        Cvar_RegisterVariable(&volume);
        Cvar_RegisterVariable(&bgmvolume);
        Cvar_RegisterVariable(&snd_staticvolume);
@@ -305,6 +303,9 @@ sfx_t *S_FindName (const char *name, qboolean stdpath)
 {
        sfx_t *sfx;
 
+       if (!snd_initialized.integer)
+               return NULL;
+
        sfx = S_GetCached (name, stdpath);
 
        // If we haven't allocated a sfx_t struct for it yet
@@ -693,7 +694,7 @@ void S_ClearBuffer(void)
        else
                clear = 0;
 
-#ifdef _WIN32
+#ifdef USE_DSOUND
        if (pDSBuf)
        {
                DWORD   dwSize;
@@ -958,7 +959,7 @@ void IN_Accumulate (void);
 void S_ExtraUpdate (void)
 {
 
-#ifdef _WIN32
+#ifdef USE_DSOUND
        IN_Accumulate ();
 #endif
 
@@ -988,7 +989,7 @@ void S_Update_(void)
        if (endtime > (unsigned int)(soundtime + samps))
                endtime = soundtime + samps;
 
-#ifdef _WIN32
+#ifdef USE_DSOUND
 // if the buffer was lost or stopped, restore it and/or restart it
        {
                DWORD   dwStatus;
@@ -1110,116 +1111,3 @@ void S_LocalSound (const char *sound, qboolean stdpath)
        if (ch_ind >= 0)
                channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
 }
-
-
-#define RAWSAMPLESBUFFER 32768
-short s_rawsamplesbuffer[RAWSAMPLESBUFFER * 2];
-int s_rawsamplesbuffer_start;
-size_t s_rawsamplesbuffer_count;
-
-void S_RawSamples_Enqueue(short *samples, unsigned int length)
-{
-       int b2, b3;
-       //Con_Printf("S_RawSamples_Enqueue: %i samples\n", length);
-       if (s_rawsamplesbuffer_count + length > RAWSAMPLESBUFFER)
-               return;
-       b2 = (s_rawsamplesbuffer_start + s_rawsamplesbuffer_count) % RAWSAMPLESBUFFER;
-       if (b2 + length > RAWSAMPLESBUFFER)
-       {
-               b3 = (b2 + length) % RAWSAMPLESBUFFER;
-               memcpy(s_rawsamplesbuffer + b2 * 2, samples, (RAWSAMPLESBUFFER - b2) * sizeof(short[2]));
-               memcpy(s_rawsamplesbuffer, samples + (RAWSAMPLESBUFFER - b2) * 2, b3 * sizeof(short[2]));
-       }
-       else
-               memcpy(s_rawsamplesbuffer + b2 * 2, samples, length * sizeof(short[2]));
-       s_rawsamplesbuffer_count += length;
-}
-
-void S_RawSamples_Dequeue(int *samples, unsigned int length)
-{
-       int b1, b2;
-       size_t l;
-       int i;
-       short *in;
-       int *out;
-       int count;
-       l = length;
-       if (l > s_rawsamplesbuffer_count)
-               l = s_rawsamplesbuffer_count;
-       b1 = (s_rawsamplesbuffer_start) % RAWSAMPLESBUFFER;
-       if (b1 + l > RAWSAMPLESBUFFER)
-       {
-               b2 = (b1 + l) % RAWSAMPLESBUFFER;
-               //memcpy(samples, s_rawsamplesbuffer + b1 * 2, (RAWSAMPLESBUFFER - b1) * sizeof(short[2]));
-               //memcpy(samples + (RAWSAMPLESBUFFER - b1) * 2, s_rawsamplesbuffer, b2 * sizeof(short[2]));
-               for (out = samples, in = s_rawsamplesbuffer + b1 * 2, count = (RAWSAMPLESBUFFER - b1) * 2, i = 0;i < count;i++)
-                       out[i] = in[i];
-               for (out = samples + (RAWSAMPLESBUFFER - b1) * 2, in = s_rawsamplesbuffer, count = b2 * 2, i = 0;i < count;i++)
-                       out[i] = in[i];
-               //Con_Printf("S_RawSamples_Dequeue: buffer wrap %i %i\n", (RAWSAMPLESBUFFER - b1), b2);
-       }
-       else
-       {
-               //memcpy(samples, s_rawsamplesbuffer + b1 * 2, l * sizeof(short[2]));
-               for (out = samples, in = s_rawsamplesbuffer + b1 * 2, count = l * 2, i = 0;i < count;i++)
-                       out[i] = in[i];
-               //Con_Printf("S_RawSamples_Dequeue: normal      %i\n", l);
-       }
-       if (l < (int)length)
-       {
-               memset(samples + l * 2, 0, (length - l) * sizeof(int[2]));
-               //Con_Printf("S_RawSamples_Dequeue: padding with %i samples\n", length - l);
-       }
-       s_rawsamplesbuffer_start = (s_rawsamplesbuffer_start + l) % RAWSAMPLESBUFFER;
-       s_rawsamplesbuffer_count -= l;
-}
-
-void S_RawSamples_ClearQueue(void)
-{
-       s_rawsamplesbuffer_count = 0;
-       s_rawsamplesbuffer_start = 0;
-}
-
-int S_RawSamples_QueueWantsMore(void)
-{
-       if (shm != NULL && s_rawsamplesbuffer_count < min(shm->format.speed >> 1, RAWSAMPLESBUFFER >> 1))
-               return RAWSAMPLESBUFFER - s_rawsamplesbuffer_count;
-       else
-               return 0;
-}
-
-void S_ResampleBuffer16Stereo(short *input, int inputlength, short *output, int outputlength)
-{
-       if (inputlength != outputlength)
-       {
-               int i, position, stopposition, step;
-               short *in, *out;
-               step = (float) inputlength * 256.0f / (float) outputlength;
-               position = 0;
-               stopposition = (inputlength - 1) << 8;
-               out = output;
-               for (i = 0;i < outputlength && position < stopposition;i++, position += step)
-               {
-                       in = input + ((position >> 8) << 1);
-                       out[0] = (((in[1] - in[0]) * (position & 255)) >> 8) + in[0];
-                       out[1] = (((in[3] - in[2]) * (position & 255)) >> 8) + in[2];
-                       out += 2;
-               }
-               stopposition = inputlength << 8;
-               for (i = 0;i < outputlength && position < stopposition;i++, position += step)
-               {
-                       in = input + ((position >> 8) << 1);
-                       out[0] = in[0];
-                       out[1] = in[2];
-                       out += 2;
-               }
-       }
-       else
-               memcpy(output, input, inputlength * sizeof(short[2]));
-}
-
-int S_RawSamples_SampleRate(void)
-{
-       return shm != NULL ? shm->format.speed : 0;
-}
-