Cvar_RegisterVariable(&volume);
Cvar_RegisterVariable(&bgmvolume);
- if (COM_CheckParm("-nosound"))
+ if (COM_CheckParm("-nosound") || COM_CheckParm("-safe"))
return;
snd_mempool = Mem_AllocPool("sound");
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]));
}
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++)
if (l < length)
{
memset(samples + l * 2, 0, (length - l) * sizeof(int[2]));
- //Con_Printf("S_RawSamples_Dequeue: padding with %i\n", length - l);
+ //Con_Printf("S_RawSamples_Dequeue: padding with %i samples\n", length - l);
}
s_rawsamplesbuffer_start = (s_rawsamplesbuffer_start + l) % RAWSAMPLESBUFFER;
s_rawsamplesbuffer_count -= l;
s_rawsamplesbuffer_start = 0;
}
+int S_RawSamples_QueueWantsMore(void)
+{
+ if (s_rawsamplesbuffer_count < min(shm->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->speed : 0;
+}