add an error check for invalid maxfrac before returning it, nothing significant

[xonotic/darkplaces.git] / snd_dma.c

diff --git a/snd_dma.c b/snd_dma.c
index 096fdfb603b61b9af9ffd7b71f2750e75b346836..0e91d01085ea880e64c443fef90e0f35c872fc60 100644 (file)
--- a/snd_dma.c
+++ b/snd_dma.c
@@ -170,7 +170,7 @@ void S_Init (void)
        Cvar_RegisterVariable(&volume);
        Cvar_RegisterVariable(&bgmvolume);
 
-       if (COM_CheckParm("-nosound"))
+       if (COM_CheckParm("-nosound") || COM_CheckParm("-safe"))
                return;
 
        snd_mempool = Mem_AllocPool("sound");
@@ -1043,9 +1043,9 @@ void S_RawSamples_Enqueue(short *samples, unsigned int length)
        if (s_rawsamplesbuffer_count + length > RAWSAMPLESBUFFER)
                return;
        b2 = (s_rawsamplesbuffer_start + s_rawsamplesbuffer_count) % RAWSAMPLESBUFFER;
-       b3 = (s_rawsamplesbuffer_start + s_rawsamplesbuffer_count + length) % RAWSAMPLESBUFFER;
-       if (b3 < b2)
+       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]));
        }
@@ -1065,9 +1065,9 @@ void S_RawSamples_Dequeue(int *samples, unsigned int length)
        if (l > s_rawsamplesbuffer_count)
                l = s_rawsamplesbuffer_count;
        b1 = (s_rawsamplesbuffer_start) % RAWSAMPLESBUFFER;
-       b2 = (s_rawsamplesbuffer_start + l) % RAWSAMPLESBUFFER;
-       if (b2 < b1)
+       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++)
@@ -1135,3 +1135,8 @@ void S_ResampleBuffer16Stereo(short *input, int inputlength, short *output, int
        else
                memcpy(output, input, inputlength * sizeof(short[2]));
 }
+
+int S_RawSamples_SampleRate(void)
+{
+       return shm != NULL ? shm->speed : 0;
+}