#include "snd_ogg.h"
#include "snd_modplug.h"
#include "csprogs.h"
+#include "cl_collision.h"
#define SND_MIN_SPEED 8000
cvar_t snd_spatialization_occlusion = {CVAR_SAVE, "snd_spatialization_occlusion", "1", "enable occlusion testing on spatialized sounds, which simply quiets sounds that are blocked by the world"};
// Cvars declared in snd_main.h (shared with other snd_*.c files)
-cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.11", "how much sound to mix ahead of time"};
+cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.15", "how much sound to mix ahead of time"};
cvar_t snd_streaming = { CVAR_SAVE, "snd_streaming", "1", "enables keeping compressed ogg sound files compressed, decompressing them only as needed, otherwise they will be decompressed completely at load (may use a lot of memory)"};
cvar_t snd_swapstereo = {CVAR_SAVE, "snd_swapstereo", "0", "swaps left/right speakers for old ISA soundblaster cards"};
extern cvar_t v_flipped;
ch_ind = S_StartSound (-1, 0, sfx, listener_origin, fvol, attenuation);
// Free the sfx if the file didn't exist
- if (ch_ind < 0)
+ if (!sfx->fetcher)
S_FreeSfx (sfx, false);
else
channels[ch_ind].flags |= CHANNELFLAG_LOCALSOUND;
S_FindName
==================
*/
+sfx_t changevolume_sfx = {""};
sfx_t *S_FindName (const char *name)
{
sfx_t *sfx;
if (!snd_initialized.integer)
return NULL;
+ if(!strcmp(name, changevolume_sfx.name))
+ return &changevolume_sfx;
+
if (strlen (name) >= sizeof (sfx->name))
{
Con_Printf ("S_FindName: sound name too long (%s)\n", name);
*/
qboolean S_IsSoundPrecached (const sfx_t *sfx)
{
- return (sfx != NULL && sfx->fetcher != NULL);
+ return (sfx != NULL && sfx->fetcher != NULL) || (sfx == &changevolume_sfx);
}
/*
}
else if (cl.entities[ch->entnum].state_current.active)
{
+ dp_model_t *model;
//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]);
- if (cl.entities[ch->entnum].state_current.modelindex && cl.model_precache[cl.entities[ch->entnum].state_current.modelindex] && cl.model_precache[cl.entities[ch->entnum].state_current.modelindex]->soundfromcenter)
+ model = CL_GetModelByIndex(cl.entities[ch->entnum].state_current.modelindex);
+ if (model && model->soundfromcenter)
VectorMAM(0.5f, cl.entities[ch->entnum].render.mins, 0.5f, cl.entities[ch->entnum].render.maxs, ch->origin);
else
Matrix4x4_OriginFromMatrix(&cl.entities[ch->entnum].render.matrix, ch->origin);
// Start a sound effect
// =======================================================================
-void S_PlaySfxOnChannel (sfx_t *sfx, channel_t *target_chan, unsigned int flags, vec3_t origin, float fvol, float attenuation, qboolean isstatic)
+static void S_SetChannelVolume_WithSfx (unsigned int ch_ind, float fvol, sfx_t *sfx);
+void S_PlaySfxOnChannel (sfx_t *sfx, channel_t *target_chan, unsigned int flags, vec3_t origin, float fvol, float attenuation, qboolean isstatic, int entnum, int entchannel, int startpos)
{
if (!sfx)
{
memset (target_chan, 0, sizeof (*target_chan));
VectorCopy (origin, target_chan->origin);
target_chan->flags = flags;
- target_chan->pos = 0; // start of the sound
+ target_chan->pos = startpos; // start of the sound
+ target_chan->entnum = entnum;
+ target_chan->entchannel = entchannel;
// If it's a static sound
if (isstatic)
{
- if (sfx->loopstart >= sfx->total_length)
+ if (sfx->loopstart >= sfx->total_length && (cls.protocol == PROTOCOL_QUAKE || cls.protocol == PROTOCOL_QUAKEWORLD))
Con_DPrintf("Quake compatibility warning: Static sound \"%s\" is not looped\n", sfx->name);
target_chan->dist_mult = attenuation / (64.0f * snd_soundradius.value);
}
else
target_chan->dist_mult = attenuation / snd_soundradius.value;
+ // we have to set the channel volume AFTER the sfx because the function
+ // needs it for replaygain support
+ S_SetChannelVolume_WithSfx(target_chan - channels, fvol, sfx);
+
+ // set the listener volumes
+ SND_Spatialize (target_chan, isstatic);
+
// Lock the SFX during play
S_LockSfx (sfx);
// finally, set the sfx pointer, so the channel becomes valid for playback
// and will be noticed by the mixer
target_chan->sfx = sfx;
-
- // we have to set the channel volume AFTER the sfx because the function
- // needs it for replaygain support
- S_SetChannelVolume(target_chan - channels, fvol);
}
int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
{
- channel_t *target_chan, *check;
- int ch_idx;
+ channel_t *target_chan, *check, *ch;
+ int ch_idx, startpos;
if (snd_renderbuffer == NULL || sfx == NULL || nosound.integer)
return -1;
+ if(sfx == &changevolume_sfx)
+ {
+ if(entchannel == 0)
+ return -1;
+ for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++)
+ {
+ ch = &channels[ch_idx];
+ if (ch->entnum == entnum && (ch->entchannel == entchannel || entchannel == -1) )
+ {
+ S_SetChannelVolume(ch_idx, fvol);
+ ch->dist_mult = attenuation / snd_soundradius.value;
+ SND_Spatialize(ch, false);
+ return ch_idx;
+ }
+ }
+ return -1;
+ }
+
if (sfx->fetcher == NULL)
return -1;
if (!target_chan)
return -1;
- S_PlaySfxOnChannel (sfx, target_chan, CHANNELFLAG_NONE, origin, fvol, attenuation, false);
- target_chan->entnum = entnum;
- target_chan->entchannel = entchannel;
-
- SND_Spatialize(target_chan, false);
-
// 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];
+ startpos = 0;
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)
+ if (check->sfx == sfx && check->pos == 0)
{
// use negative pos offset to delay this sound effect
- target_chan->pos += (int)lhrandom(0, -0.1 * snd_renderbuffer->format.speed);
+ startpos = (int)lhrandom(0, -0.1 * snd_renderbuffer->format.speed);
break;
}
}
+ S_PlaySfxOnChannel (sfx, target_chan, CHANNELFLAG_NONE, origin, fvol, attenuation, false, entnum, entchannel, startpos);
+
return (target_chan - channels);
}
}
}
-void S_SetChannelVolume (unsigned int ch_ind, float fvol)
+static void S_SetChannelVolume_WithSfx (unsigned int ch_ind, float fvol, sfx_t *sfx)
{
- sfx_t *sfx = channels[ch_ind].sfx;
if(sfx->volume_peak > 0)
{
// Replaygain support
channels[ch_ind].master_vol = (int)(fvol * 255.0f);
}
+void S_SetChannelVolume(unsigned int ch_ind, float fvol)
+{
+ sfx_t *sfx = channels[ch_ind].sfx;
+ S_SetChannelVolume_WithSfx(ch_ind, fvol, sfx);
+}
+
float S_GetChannelPosition (unsigned int ch_ind)
{
// note: this is NOT accurate yet
}
target_chan = &channels[total_channels++];
- S_PlaySfxOnChannel (sfx, target_chan, CHANNELFLAG_FORCELOOP, origin, fvol, attenuation, true);
-
- SND_Spatialize (target_chan, true);
+ S_PlaySfxOnChannel (sfx, target_chan, CHANNELFLAG_FORCELOOP, origin, fvol, attenuation, true, 0, 0, 0);
}
projects / xonotic / darkplaces.git / blobdiff