Cvar_RegisterVariable(&volume);
Cvar_RegisterVariable(&bgmvolume);
- if (COM_CheckParm("-nosound"))
+ if (COM_CheckParm("-nosound") || COM_CheckParm("-safe"))
return;
snd_mempool = Mem_AllocPool("sound");
Sys_Error ("S_FindName: out of sfx_t");
sfx = &known_sfx[i];
+ memset(sfx, 0, sizeof(*sfx));
strcpy (sfx->name, name);
num_sfx++;
void S_TouchSound (char *name)
{
sfx_t *sfx;
-
+
if (!sound_started)
return;
// calc ambient sound levels
for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++)
{
+ if (ambient_sfx[ambient_channel] && ambient_sfx[ambient_channel]->silentlymissing)
+ continue;
chan = &channels[ambient_channel];
chan->sfx = ambient_sfx[ambient_channel];
// mix ahead of current position
endtime = soundtime + _snd_mixahead.value * shm->speed;
samps = shm->samples >> (shm->channels-1);
- if (endtime - soundtime > samps)
+ if (endtime > (unsigned int)(soundtime + samps))
endtime = soundtime + samps;
#ifdef _WIN32
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++)
out[i] = in[i];
//Con_Printf("S_RawSamples_Dequeue: normal %i\n", l);
}
- if (l < length)
+ 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);
else
memcpy(output, input, inputlength * sizeof(short[2]));
}
+
+int S_RawSamples_SampleRate(void)
+{
+ return shm != NULL ? shm->speed : 0;
+}