This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
void S_Play(void);
void S_PlayVol(void);
+void S_Play2(void);
void S_SoundList(void);
void S_Update_();
void S_StopAllSounds(qboolean clear);
// Internal sound data & structures
// =======================================================================
-channel_t channels[MAX_CHANNELS];
-int total_channels;
+channel_t channels[MAX_CHANNELS];
+int total_channels;
-int snd_blocked = 0;
-static qboolean snd_ambient = 1;
-qboolean snd_initialized = false;
+int snd_blocked = 0;
+static qboolean snd_ambient = 1;
+qboolean snd_initialized = false;
// pointer should go away
-volatile dma_t *shm = 0;
+volatile dma_t *shm = 0;
volatile dma_t sn;
-vec3_t listener_origin;
-vec3_t listener_forward;
-vec3_t listener_right;
-vec3_t listener_up;
-vec_t sound_nominal_clip_dist=1000.0;
+vec3_t listener_origin;
+vec3_t listener_forward;
+vec3_t listener_right;
+vec3_t listener_up;
+vec_t sound_nominal_clip_dist=1000.0;
+mempool_t *snd_mempool;
-int soundtime; // sample PAIRS
-int paintedtime; // sample PAIRS
+// sample PAIRS
+int soundtime;
+int paintedtime;
//LordHavoc: increased the client sound limit from 512 to 4096 for the Nehahra movie
-#define MAX_SFX 4096
-sfx_t *known_sfx; // hunk allocated [MAX_SFX]
-int num_sfx;
-
-sfx_t *ambient_sfx[NUM_AMBIENTS];
+#define MAX_SFX 4096
+sfx_t *known_sfx; // allocated [MAX_SFX]
+int num_sfx;
-int desired_speed = 11025;
-int desired_bits = 16;
+sfx_t *ambient_sfx[NUM_AMBIENTS];
-int sound_started=0;
+int sound_started = 0;
-cvar_t bgmvolume = {"bgmvolume", "1", true};
-cvar_t volume = {"volume", "0.7", true};
+cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1"};
+cvar_t volume = {CVAR_SAVE, "volume", "0.7"};
+cvar_t snd_staticvolume = {CVAR_SAVE, "snd_staticvolume", "1"};
-cvar_t nosound = {"nosound", "0"};
-cvar_t precache = {"precache", "1"};
-cvar_t loadas8bit = {"loadas8bit", "0"};
-cvar_t bgmbuffer = {"bgmbuffer", "4096"};
-cvar_t ambient_level = {"ambient_level", "0.3"};
-cvar_t ambient_fade = {"ambient_fade", "100"};
-cvar_t snd_noextraupdate = {"snd_noextraupdate", "0"};
-cvar_t snd_show = {"snd_show", "0"};
-cvar_t _snd_mixahead = {"_snd_mixahead", "0.1", true};
-cvar_t snd_swapstereo = {"snd_swapstereo", "0", true};
+cvar_t nosound = {0, "nosound", "0"};
+cvar_t snd_precache = {0, "snd_precache", "1"};
+cvar_t bgmbuffer = {0, "bgmbuffer", "4096"};
+cvar_t ambient_level = {0, "ambient_level", "0.3"};
+cvar_t ambient_fade = {0, "ambient_fade", "100"};
+cvar_t snd_noextraupdate = {0, "snd_noextraupdate", "0"};
+cvar_t snd_show = {0, "snd_show", "0"};
+cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.1"};
+cvar_t snd_swapstereo = {CVAR_SAVE, "snd_swapstereo", "0"};
// ====================================================================
Con_Printf ("sound system not started\n");
return;
}
-
- Con_Printf("%5d stereo\n", shm->channels - 1);
- Con_Printf("%5d samples\n", shm->samples);
- Con_Printf("%5d samplepos\n", shm->samplepos);
- Con_Printf("%5d samplebits\n", shm->samplebits);
- Con_Printf("%5d submission_chunk\n", shm->submission_chunk);
- Con_Printf("%5d speed\n", shm->speed);
- Con_Printf("0x%x dma buffer\n", shm->buffer);
+
+ Con_Printf("%5d stereo\n", shm->channels - 1);
+ Con_Printf("%5d samples\n", shm->samples);
+ Con_Printf("%5d samplepos\n", shm->samplepos);
+ Con_Printf("%5d samplebits\n", shm->samplebits);
+ Con_Printf("%5d submission_chunk\n", shm->submission_chunk);
+ Con_Printf("%5d speed\n", shm->speed);
+ Con_Printf("0x%x dma buffer\n", shm->buffer);
Con_Printf("%5d total_channels\n", total_channels);
}
S_Startup
================
*/
-
void S_Startup (void)
{
- int rc;
+ int rc;
if (!snd_initialized)
return;
if (!rc)
{
-#ifndef _WIN32
Con_Printf("S_Startup: SNDDMA_Init failed.\n");
-#endif
sound_started = 0;
return;
}
sound_started = 1;
}
-
-void S_Play2(void);
-
/*
================
S_Init
*/
void S_Init (void)
{
+ Con_DPrintf("\nSound Initialization\n");
- Con_Printf("\nSound Initialization\n");
+ S_RawSamples_ClearQueue();
- if (COM_CheckParm("-nosound"))
+ Cvar_RegisterVariable(&volume);
+ Cvar_RegisterVariable(&bgmvolume);
+ Cvar_RegisterVariable(&snd_staticvolume);
+
+ if (COM_CheckParm("-nosound") || COM_CheckParm("-safe"))
return;
+ snd_mempool = Mem_AllocPool("sound");
+
if (COM_CheckParm("-simsound"))
fakedma = true;
Cmd_AddCommand("soundinfo", S_SoundInfo_f);
Cvar_RegisterVariable(&nosound);
- Cvar_RegisterVariable(&volume);
- Cvar_RegisterVariable(&precache);
- Cvar_RegisterVariable(&loadas8bit);
- Cvar_RegisterVariable(&bgmvolume);
+ Cvar_RegisterVariable(&snd_precache);
Cvar_RegisterVariable(&bgmbuffer);
Cvar_RegisterVariable(&ambient_level);
Cvar_RegisterVariable(&ambient_fade);
Cvar_RegisterVariable(&_snd_mixahead);
Cvar_RegisterVariable(&snd_swapstereo); // LordHavoc: for people with backwards sound wiring
- if (host_parms.memsize < 0x800000)
- {
- Cvar_Set ("loadas8bit", "1");
- Con_Printf ("loading all sounds as 8bit\n");
- }
-
-
-
snd_initialized = true;
+ known_sfx = Mem_Alloc(snd_mempool, MAX_SFX*sizeof(sfx_t));
+ num_sfx = 0;
+
S_Startup ();
SND_InitScaletable ();
- known_sfx = Hunk_AllocName (MAX_SFX*sizeof(sfx_t), "sfx_t");
- num_sfx = 0;
-
// create a piece of DMA memory
if (fakedma)
{
- shm = (void *) Hunk_AllocName(sizeof(*shm), "shm");
+ shm = (void *) Mem_Alloc(snd_mempool, sizeof(*shm));
shm->splitbuffer = 0;
shm->samplebits = 16;
shm->speed = 22050;
shm->soundalive = true;
shm->gamealive = true;
shm->submission_chunk = 1;
- shm->buffer = Hunk_AllocName(1<<16, "shmbuf");
+ shm->buffer = Mem_Alloc(snd_mempool, shm->channels * shm->samples * (shm->samplebits / 8));
}
- Con_Printf ("Sound sampling rate: %i\n", shm->speed);
+ if (!sound_started)
+ return;
+
+ Con_DPrintf ("Sound sampling rate: %i\n", shm->speed);
// provides a tick sound until washed clean
-// if (shm->buffer)
-// shm->buffer[4] = shm->buffer[5] = 0x7f; // force a pop for debugging
-
- ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav");
- ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav");
+ ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav", false);
+ ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav", false);
S_StopAllSounds (true);
}
void S_Shutdown(void)
{
-
if (!sound_started)
return;
sound_started = 0;
if (!fakedma)
- {
SNDDMA_Shutdown();
- }
}
*/
sfx_t *S_FindName (char *name)
{
- int i;
- sfx_t *sfx;
+ int i;
+ sfx_t *sfx;
if (!name)
- Sys_Error ("S_FindName: NULL\n");
+ Host_Error ("S_FindName: NULL\n");
if (strlen(name) >= MAX_QPATH)
- Sys_Error ("Sound name too long: %s", name);
+ Host_Error ("Sound name too long: %s", name);
// see if already loaded
- for (i=0 ; i < num_sfx ; i++)
+ for (i = 0;i < num_sfx;i++)
if (!strcmp(known_sfx[i].name, name))
- {
return &known_sfx[i];
- }
if (num_sfx == MAX_SFX)
Sys_Error ("S_FindName: out of sfx_t");
-
+
sfx = &known_sfx[i];
+ memset(sfx, 0, sizeof(*sfx));
strcpy (sfx->name, name);
num_sfx++;
-
+
return sfx;
}
void S_TouchSound (char *name)
{
sfx_t *sfx;
-
+
if (!sound_started)
return;
sfx = S_FindName (name);
- Cache_Check (&sfx->cache);
}
/*
==================
*/
-sfx_t *S_PrecacheSound (char *name)
+sfx_t *S_PrecacheSound (char *name, int complain)
{
- sfx_t *sfx;
+ sfx_t *sfx;
- if (!sound_started || nosound.value)
+ if (!sound_started || nosound.integer)
return NULL;
sfx = S_FindName (name);
-
+
// cache it in
- if (precache.value)
- S_LoadSound (sfx);
-
+ if (snd_precache.integer)
+ S_LoadSound (sfx, complain);
+
return sfx;
}
*/
channel_t *SND_PickChannel(int entnum, int entchannel)
{
- int ch_idx;
- int first_to_die;
- int life_left;
+ int ch_idx;
+ int first_to_die;
+ int life_left;
// Check for replacement sound, or find the best one to replace
- first_to_die = -1;
- life_left = 0x7fffffff;
- for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++)
- {
+ first_to_die = -1;
+ life_left = 0x7fffffff;
+ for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++)
+ {
if (entchannel != 0 // channel 0 never overrides
&& channels[ch_idx].entnum == entnum
&& (channels[ch_idx].entchannel == entchannel || entchannel == -1) )
- { // allways override sound from same entity
+ { // always override sound from same entity
first_to_die = ch_idx;
break;
}
life_left = channels[ch_idx].end - paintedtime;
first_to_die = ch_idx;
}
- }
+ }
if (first_to_die == -1)
return NULL;
if (channels[first_to_die].sfx)
channels[first_to_die].sfx = NULL;
- return &channels[first_to_die];
-}
+ return &channels[first_to_die];
+}
/*
=================
SND_Spatialize
=================
*/
-void SND_Spatialize(channel_t *ch)
+void SND_Spatialize(channel_t *ch, int isstatic)
{
- vec_t dot;
- vec_t dist;
- vec_t lscale, rscale, scale;
- vec3_t source_vec;
+ vec_t dot;
+ vec_t dist;
+ vec_t lscale, rscale, scale;
+ vec3_t source_vec;
sfx_t *snd;
-// anything coming from the view entity will allways be full volume
-// LordHavoc: make sounds with ATTN_NONE have no spatialization
+ // anything coming from the view entity will always be full volume
+ // LordHavoc: make sounds with ATTN_NONE have no spatialization
if (ch->entnum == cl.viewentity || ch->dist_mult == 0)
{
ch->leftvol = ch->master_vol;
ch->rightvol = ch->master_vol;
- return;
}
+ else
+ {
+ // update sound origin if we know about the entity
+ if (ch->entnum > 0 && cls.state == ca_connected && cl_entities[ch->entnum].state_current.active)
+ {
+ //Con_Printf("-- entnum %i origin %f %f %f neworigin %f %f %f\n", ch->entnum, ch->origin[0], ch->origin[1], ch->origin[2], cl_entities[ch->entnum].state_current.origin[0], cl_entities[ch->entnum].state_current.origin[1], cl_entities[ch->entnum].state_current.origin[2]);
+ VectorCopy(cl_entities[ch->entnum].state_current.origin, ch->origin);
+ if (cl_entities[ch->entnum].state_current.modelindex && cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->brush.TraceBox)
+ VectorMAMAM(1.0f, ch->origin, 0.5f, cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->normalmins, 0.5f, cl.model_precache[cl_entities[ch->entnum].state_current.modelindex]->normalmaxs, ch->origin);
+ }
-// calculate stereo seperation and distance attenuation
+ // calculate stereo seperation and distance attenuation
+ snd = ch->sfx;
+ VectorSubtract(ch->origin, listener_origin, source_vec);
- snd = ch->sfx;
- VectorSubtract(ch->origin, listener_origin, source_vec);
-
- dist = VectorNormalizeLength(source_vec) * ch->dist_mult;
-
- dot = DotProduct(listener_right, source_vec);
+ dist = VectorNormalizeLength(source_vec) * ch->dist_mult;
- if (shm->channels == 1)
- {
- rscale = 1.0;
- lscale = 1.0;
+ dot = DotProduct(listener_right, source_vec);
+
+ if (shm->channels == 1)
+ {
+ rscale = 1.0;
+ lscale = 1.0;
+ }
+ else
+ {
+ rscale = 1.0 + dot;
+ lscale = 1.0 - dot;
+ }
+
+ // add in distance effect
+ scale = (1.0 - dist) * rscale;
+ ch->rightvol = (int) (ch->master_vol * scale);
+ if (ch->rightvol < 0)
+ ch->rightvol = 0;
+
+ scale = (1.0 - dist) * lscale;
+ ch->leftvol = (int) (ch->master_vol * scale);
+ if (ch->leftvol < 0)
+ ch->leftvol = 0;
}
- else
+
+ // LordHavoc: allow adjusting volume of static sounds
+ if (isstatic)
{
- rscale = 1.0 + dot;
- lscale = 1.0 - dot;
+ ch->leftvol *= snd_staticvolume.value;
+ ch->rightvol *= snd_staticvolume.value;
}
-
-// add in distance effect
- scale = (1.0 - dist) * rscale;
- ch->rightvol = (int) (ch->master_vol * scale);
- if (ch->rightvol < 0)
- ch->rightvol = 0;
-
- scale = (1.0 - dist) * lscale;
- ch->leftvol = (int) (ch->master_vol * scale);
- if (ch->leftvol < 0)
- ch->leftvol = 0;
-}
+}
// =======================================================================
if (!sfx)
return;
- if (nosound.value)
+ if (nosound.integer)
return;
vol = fvol*255;
target_chan = SND_PickChannel(entnum, entchannel);
if (!target_chan)
return;
-
+
// spatialize
memset (target_chan, 0, sizeof(*target_chan));
+ /*
+ if (cls.state == ca_connected && entnum > 0 && cl_entities[entnum].state_current.active)
+ {
+ target_chan.follow = true;
+ VectorSubtract(origin, cl_entities[entnum].state_current.origin, target_chan.followoriginoffset);
+ }
+ */
VectorCopy(origin, target_chan->origin);
target_chan->dist_mult = attenuation / sound_nominal_clip_dist;
target_chan->master_vol = vol;
target_chan->entnum = entnum;
target_chan->entchannel = entchannel;
- SND_Spatialize(target_chan);
+ SND_Spatialize(target_chan, false);
if (!target_chan->leftvol && !target_chan->rightvol)
return; // not audible at all
// new channel
- sc = S_LoadSound (sfx);
+ sc = S_LoadSound (sfx, true);
if (!sc)
{
target_chan->sfx = NULL;
target_chan->sfx = sfx;
target_chan->pos = 0.0;
- target_chan->end = paintedtime + sc->length;
+ target_chan->end = paintedtime + sc->length;
// if an identical sound has also been started this frame, offset the pos
// a bit to keep it from just making the first one louder
check = &channels[NUM_AMBIENTS];
- for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++, check++)
- {
+ for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++, check++)
+ {
if (check == target_chan)
continue;
if (check->sfx == sfx && !check->pos)
{
- skip = rand () % (int)(0.1*shm->speed);
- if (skip >= target_chan->end)
- skip = target_chan->end - 1;
+ // LordHavoc: fixed skip calculations
+ skip = 0.1 * shm->speed;
+ if (skip > sc->length)
+ skip = sc->length;
+ if (skip > 0)
+ skip = rand() % skip;
target_chan->pos += skip;
target_chan->end -= skip;
break;
}
-
+
}
}
void S_StopAllSounds(qboolean clear)
{
- int i;
-
if (!sound_started)
return;
total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS; // no statics
-
- for (i=0 ; i<MAX_CHANNELS ; i++)
- if (channels[i].sfx)
- channels[i].sfx = NULL;
-
memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
if (clear)
void S_ClearBuffer (void)
{
int clear;
-
+
#ifdef _WIN32
if (!sound_started || !shm || (!shm->buffer && !pDSBuf))
#else
memset(pData, clear, shm->samples * shm->samplebits/8);
pDSBuf->lpVtbl->Unlock(pDSBuf, pData, dwSize, NULL, 0);
-
+
}
else
#endif
{
- memset(shm->buffer, clear, shm->samples * shm->samplebits/8);
+ int setsize = shm->samples * shm->samplebits / 8;
+ char *buf = shm->buffer;
+
+ while (setsize--)
+ *buf++ = 0;
+
+// on i586/i686 optimized versions of glibc, glibc *wrongly* IMO,
+// reads the memory area before writing to it causing a seg fault
+// since the memory is PROT_WRITE only and not PROT_READ|PROT_WRITE
+// memset(shm->buffer, clear, shm->samples * shm->samplebits/8);
}
}
return;
}
- ss = &channels[total_channels];
- total_channels++;
-
- sc = S_LoadSound (sfx);
+ sc = S_LoadSound (sfx, true);
if (!sc)
return;
if (sc->loopstart == -1)
- {
- Con_Printf ("Sound %s not looped\n", sfx->name);
- return;
- }
-
+ Con_DPrintf("Quake compatibility warning: Static sound \"%s\" is not looped\n", sfx->name);
+
+ ss = &channels[total_channels++];
+ memset(ss, 0, sizeof(*ss));
+ ss->forceloop = true;
ss->sfx = sfx;
VectorCopy (origin, ss->origin);
ss->master_vol = vol;
ss->dist_mult = (attenuation/64) / sound_nominal_clip_dist;
- ss->end = paintedtime + sc->length;
-
- SND_Spatialize (ss);
+ ss->end = paintedtime + sc->length;
+
+ SND_Spatialize (ss, true);
}
*/
void S_UpdateAmbientSounds (void)
{
- mleaf_t *l;
float vol;
int ambient_channel;
channel_t *chan;
+ qbyte ambientlevels[NUM_AMBIENTS];
- if (!snd_ambient)
- return;
+ // LordHavoc: kill ambient sounds until proven otherwise
+ for (ambient_channel = 0 ; ambient_channel < NUM_AMBIENTS;ambient_channel++)
+ channels[ambient_channel].sfx = NULL;
-// calc ambient sound levels
- if (!cl.worldmodel)
+ if (!snd_ambient || ambient_level.value <= 0 || !cl.worldmodel || !cl.worldmodel->brush.AmbientSoundLevelsForPoint)
return;
- l = Mod_PointInLeaf (listener_origin, cl.worldmodel);
- if (!l || !ambient_level.value)
- {
- for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++)
- channels[ambient_channel].sfx = NULL;
- return;
- }
+ cl.worldmodel->brush.AmbientSoundLevelsForPoint(cl.worldmodel, listener_origin, ambientlevels, sizeof(ambientlevels));
+// calc ambient sound levels
for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++)
{
- chan = &channels[ambient_channel];
+ if (ambient_sfx[ambient_channel] && ambient_sfx[ambient_channel]->silentlymissing)
+ continue;
+ chan = &channels[ambient_channel];
+ chan->forceloop = true;
chan->sfx = ambient_sfx[ambient_channel];
-
- vol = ambient_level.value * l->ambient_sound_level[ambient_channel];
+
+ vol = ambient_level.value * ambientlevels[ambient_channel];
if (vol < 8)
vol = 0;
// don't adjust volume too fast
if (chan->master_vol < vol)
{
- chan->master_vol += host_frametime * ambient_fade.value;
+ chan->master_vol += host_realframetime * ambient_fade.value;
if (chan->master_vol > vol)
chan->master_vol = vol;
}
else if (chan->master_vol > vol)
{
- chan->master_vol -= host_frametime * ambient_fade.value;
+ chan->master_vol -= host_realframetime * ambient_fade.value;
if (chan->master_vol < vol)
chan->master_vol = vol;
}
-
+
chan->leftvol = chan->rightvol = chan->master_vol;
}
}
VectorCopy(forward, listener_forward);
VectorCopy(right, listener_right);
VectorCopy(up, listener_up);
-
+
// update general area ambient sound sources
S_UpdateAmbientSounds ();
combine = NULL;
-// update spatialization for static and dynamic sounds
+// update spatialization for static and dynamic sounds
ch = channels+NUM_AMBIENTS;
for (i=NUM_AMBIENTS ; i<total_channels; i++, ch++)
{
if (!ch->sfx)
continue;
- SND_Spatialize(ch); // respatialize channel
+ SND_Spatialize(ch, i >= MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS); // respatialize channel
if (!ch->leftvol && !ch->rightvol)
continue;
// try to combine static sounds with a previous channel of the same
// sound effect so we don't mix five torches every frame
-
- if (i >= MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS)
+
+ if (i > MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS)
{
// see if it can just use the last one
if (combine && combine->sfx == ch->sfx)
for (j=MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS ; j<i; j++, combine++)
if (combine->sfx == ch->sfx)
break;
-
+
if (j == total_channels)
- {
combine = NULL;
- }
else
{
if (combine != ch)
continue;
}
}
-
-
}
//
// debugging output
//
- if (snd_show.value)
+ if (snd_show.integer)
{
total = 0;
ch = channels;
for (i=0 ; i<total_channels; i++, ch++)
if (ch->sfx && (ch->leftvol || ch->rightvol) )
- {
- //Con_Printf ("%3i %3i %s\n", ch->leftvol, ch->rightvol, ch->sfx->name);
total++;
- }
-
+
Con_Printf ("----(%i)----\n", total);
}
static int buffers;
static int oldsamplepos;
int fullsamples;
-
+
fullsamples = shm->samples / shm->channels;
// it is possible to miscount buffers if it has wrapped twice between
if (samplepos < oldsamplepos)
{
buffers++; // buffer wrapped
-
+
if (paintedtime > 0x40000000)
{ // time to chop things off to avoid 32 bit limits
buffers = 0;
IN_Accumulate ();
#endif
- if (snd_noextraupdate.value)
+ if (snd_noextraupdate.integer)
return; // don't pollute timings
S_Update_();
}
{
unsigned endtime;
int samps;
-
+
if (!sound_started || (snd_blocked > 0))
return;
// check to make sure that we haven't overshot
if (paintedtime < soundtime)
- {
- //Con_Printf ("S_Update_ : overflow\n");
paintedtime = soundtime;
- }
// 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 (pDSBuf->lpVtbl->GetStatus (pDSBuf, &dwStatus) != DD_OK)
Con_Printf ("Couldn't get sound buffer status\n");
-
+
if (dwStatus & DSBSTATUS_BUFFERLOST)
pDSBuf->lpVtbl->Restore (pDSBuf);
-
+
if (!(dwStatus & DSBSTATUS_PLAYING))
pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING);
}
void S_Play(void)
{
- static int hash=345;
int i;
char name[256];
sfx_t *sfx;
-
+
i = 1;
while (i<Cmd_Argc())
{
}
else
strcpy(name, Cmd_Argv(i));
- sfx = S_PrecacheSound(name);
- S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 1.0);
+ sfx = S_PrecacheSound(name, true);
+ S_StartSound(-1, 0, sfx, listener_origin, 1.0, 1.0);
i++;
}
}
void S_Play2(void)
{
- static int hash=345;
int i;
char name[256];
sfx_t *sfx;
-
+
i = 1;
while (i<Cmd_Argc())
{
}
else
strcpy(name, Cmd_Argv(i));
- sfx = S_PrecacheSound(name);
- S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 0.0);
+ sfx = S_PrecacheSound(name, true);
+ S_StartSound(-1, 0, sfx, listener_origin, 1.0, 0.0);
i++;
}
}
void S_PlayVol(void)
{
- static int hash=543;
int i;
float vol;
char name[256];
sfx_t *sfx;
-
+
i = 1;
while (i<Cmd_Argc())
{
}
else
strcpy(name, Cmd_Argv(i));
- sfx = S_PrecacheSound(name);
+ sfx = S_PrecacheSound(name, true);
vol = atof(Cmd_Argv(i+1));
- S_StartSound(hash++, 0, sfx, listener_origin, vol, 1.0);
+ S_StartSound(-1, 0, sfx, listener_origin, vol, 1.0);
i+=2;
}
}
total = 0;
for (sfx=known_sfx, i=0 ; i<num_sfx ; i++, sfx++)
{
- sc = Cache_Check (&sfx->cache);
+ sc = sfx->sfxcache;
if (!sc)
continue;
size = sc->length*sc->width*(sc->stereo+1);
{
sfx_t *sfx;
- if (nosound.value)
+ if (nosound.integer)
return;
if (!sound_started)
return;
-
- sfx = S_PrecacheSound (sound);
+
+ sfx = S_PrecacheSound (sound, true);
if (!sfx)
{
- Con_Printf ("S_LocalSound: can't cache %s\n", sound);
+ Con_Printf ("S_LocalSound: can't precache %s\n", sound);
return;
}
S_StartSound (cl.viewentity, -1, sfx, vec3_origin, 1, 1);
{
}
+
+#define RAWSAMPLESBUFFER 32768
+short s_rawsamplesbuffer[RAWSAMPLESBUFFER * 2];
+int s_rawsamplesbuffer_start;
+int 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, 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 (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;
+}