#include "snd_main.h"
#include "snd_ogg.h"
+#include "snd_modplug.h"
+#include "csprogs.h"
+#include "cl_collision.h"
#define SND_MIN_SPEED 8000
-#define SND_MAX_SPEED 48000
+#define SND_MAX_SPEED 96000
#define SND_MIN_WIDTH 1
#define SND_MAX_WIDTH 2
#define SND_MIN_CHANNELS 1
#define SND_MAX_CHANNELS 8
-
#if SND_LISTENERS != 8
# error this data only supports up to 8 channel, update it!
#endif
-typedef struct listener_s
-{
- float yawangle;
- float dotscale;
- float dotbias;
- float ambientvolume;
-}
-listener_t;
-typedef struct speakerlayout_s
-{
- const char *name;
- unsigned int channels;
- listener_t listeners[SND_LISTENERS];
-}
-speakerlayout_t;
-static speakerlayout_t snd_speakerlayout;
+speakerlayout_t snd_speakerlayout;
// Our speaker layouts are based on ALSA. They differ from those
// Win32 and Mac OS X APIs use when there's more than 4 channels.
{
"surround71", 8,
{
- {45, 0.2, 0.2, 0.5}, // front left
- {315, 0.2, 0.2, 0.5}, // front right
- {135, 0.2, 0.2, 0.5}, // rear left
- {225, 0.2, 0.2, 0.5}, // rear right
- {0, 0.2, 0.2, 0.5}, // front center
- {0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so... no lfe)
- {90, 0.2, 0.2, 0.5}, // side left
- {180, 0.2, 0.2, 0.5}, // side right
+ {0, 45, 0.2, 0.2, 0.5}, // front left
+ {1, 315, 0.2, 0.2, 0.5}, // front right
+ {2, 135, 0.2, 0.2, 0.5}, // rear left
+ {3, 225, 0.2, 0.2, 0.5}, // rear right
+ {4, 0, 0.2, 0.2, 0.5}, // front center
+ {5, 0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so... no lfe)
+ {6, 90, 0.2, 0.2, 0.5}, // side left
+ {7, 180, 0.2, 0.2, 0.5}, // side right
}
},
{
"surround51", 6,
{
- {45, 0.2, 0.2, 0.5}, // front left
- {315, 0.2, 0.2, 0.5}, // front right
- {135, 0.2, 0.2, 0.5}, // rear left
- {225, 0.2, 0.2, 0.5}, // rear right
- {0, 0.2, 0.2, 0.5}, // front center
- {0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so... no lfe)
- {0, 0, 0, 0},
- {0, 0, 0, 0},
+ {0, 45, 0.2, 0.2, 0.5}, // front left
+ {1, 315, 0.2, 0.2, 0.5}, // front right
+ {2, 135, 0.2, 0.2, 0.5}, // rear left
+ {3, 225, 0.2, 0.2, 0.5}, // rear right
+ {4, 0, 0.2, 0.2, 0.5}, // front center
+ {5, 0, 0, 0, 0}, // lfe (we don't have any good lfe sound sources and it would take some filtering work to generate them (and they'd probably still be wrong), so... no lfe)
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
}
},
{
// channel of its own
"surround40", 4,
{
- {45, 0.3, 0.3, 0.8}, // front left
- {315, 0.3, 0.3, 0.8}, // front right
- {135, 0.3, 0.3, 0.8}, // rear left
- {225, 0.3, 0.3, 0.8}, // rear right
- {0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0},
+ {0, 45, 0.3, 0.3, 0.8}, // front left
+ {1, 315, 0.3, 0.3, 0.8}, // front right
+ {2, 135, 0.3, 0.3, 0.8}, // rear left
+ {3, 225, 0.3, 0.3, 0.8}, // rear right
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
}
},
{
// channel of its own
"stereo", 2,
{
- {90, 0.5, 0.5, 1}, // side left
- {270, 0.5, 0.5, 1}, // side right
- {0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0},
+ {0, 90, 0.5, 0.5, 1}, // side left
+ {1, 270, 0.5, 0.5, 1}, // side right
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
}
},
{
"mono", 1,
{
- {0, 0, 1, 1}, // center
- {0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0},
- {0, 0, 0, 0},
+ {0, 0, 0, 1, 1}, // center
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
+ {0, 0, 0, 0, 0},
}
}
};
unsigned int total_channels;
snd_ringbuffer_t *snd_renderbuffer = NULL;
-unsigned int soundtime = 0;
+static unsigned int soundtime = 0;
static unsigned int oldpaintedtime = 0;
static unsigned int extrasoundtime = 0;
static double snd_starttime = 0.0;
+qboolean snd_threaded = false;
+qboolean snd_usethreadedmixing = false;
vec3_t listener_origin;
+matrix4x4_t listener_basematrix;
+static unsigned char *listener_pvs = NULL;
+static int listener_pvsbytes = 0;
matrix4x4_t listener_matrix[SND_LISTENERS];
mempool_t *snd_mempool;
static int current_channellayout = SND_CHANNELLAYOUT_AUTO;
static int current_channellayout_used = SND_CHANNELLAYOUT_AUTO;
+static float spatialpower, spatialmin, spatialdiff, spatialoffset, spatialfactor;
+typedef enum { SPATIAL_NONE, SPATIAL_LOG, SPATIAL_POW, SPATIAL_THRESH } spatialmethod_t;
+spatialmethod_t spatialmethod;
+
// Cvars declared in sound.h (part of the sound API)
cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1", "volume of background music (such as CD music or replacement files such as sound/cdtracks/track002.ogg)"};
+cvar_t mastervolume = {CVAR_SAVE, "mastervolume", "0.7", "master volume"};
cvar_t volume = {CVAR_SAVE, "volume", "0.7", "volume of sound effects"};
cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0", "indicates the sound subsystem is active"};
cvar_t snd_staticvolume = {CVAR_SAVE, "snd_staticvolume", "1", "volume of ambient sound effects (such as swampy sounds at the start of e1m2)"};
-cvar_t snd_soundradius = {0, "snd_soundradius", "1000", "radius of weapon sounds and other standard sound effects (monster idle noises are half this radius and flickering light noises are one third of this radius)"};
+cvar_t snd_soundradius = {CVAR_SAVE, "snd_soundradius", "1200", "radius of weapon sounds and other standard sound effects (monster idle noises are half this radius and flickering light noises are one third of this radius)"};
+cvar_t snd_spatialization_min_radius = {CVAR_SAVE, "snd_spatialization_min_radius", "10000", "use minimum spatialization above to this radius"};
+cvar_t snd_spatialization_max_radius = {CVAR_SAVE, "snd_spatialization_max_radius", "100", "use maximum spatialization below this radius"};
+cvar_t snd_spatialization_min = {CVAR_SAVE, "snd_spatialization_min", "0.70", "minimum spatializazion of sounds"};
+cvar_t snd_spatialization_max = {CVAR_SAVE, "snd_spatialization_max", "0.95", "maximum spatialization of sounds"};
+cvar_t snd_spatialization_power = {CVAR_SAVE, "snd_spatialization_power", "0", "exponent of the spatialization falloff curve (0: logarithmic)"};
+cvar_t snd_spatialization_control = {CVAR_SAVE, "snd_spatialization_control", "0", "enable spatialization control (headphone friendly mode)"};
+cvar_t snd_spatialization_prologic = {CVAR_SAVE, "snd_spatialization_prologic", "0", "use dolby prologic (I, II or IIx) encoding (snd_channels must be 2)"};
+cvar_t snd_spatialization_prologic_frontangle = {CVAR_SAVE, "snd_spatialization_prologic_frontangle", "30", "the angle between the front speakers and the center speaker"};
+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; 1 enables PVS method, 2 enables LineOfSight method, 3 enables both"};
// Cvars declared in snd_main.h (shared with other snd_*.c files)
-cvar_t _snd_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.1", "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;
cvar_t snd_channellayout = {0, "snd_channellayout", "0", "channel layout. Can be 0 (auto - snd_restart needed), 1 (standard layout), or 2 (ALSA layout)"};
+cvar_t snd_mutewhenidle = {CVAR_SAVE, "snd_mutewhenidle", "1", "whether to disable sound output when game window is inactive"};
+cvar_t snd_entchannel0volume = {CVAR_SAVE, "snd_entchannel0volume", "1", "volume multiplier of the auto-allocate entity channel of regular entities (DEPRECATED)"};
+cvar_t snd_entchannel1volume = {CVAR_SAVE, "snd_entchannel1volume", "1", "volume multiplier of the 1st entity channel of regular entities (DEPRECATED)"};
+cvar_t snd_entchannel2volume = {CVAR_SAVE, "snd_entchannel2volume", "1", "volume multiplier of the 2nd entity channel of regular entities (DEPRECATED)"};
+cvar_t snd_entchannel3volume = {CVAR_SAVE, "snd_entchannel3volume", "1", "volume multiplier of the 3rd entity channel of regular entities (DEPRECATED)"};
+cvar_t snd_entchannel4volume = {CVAR_SAVE, "snd_entchannel4volume", "1", "volume multiplier of the 4th entity channel of regular entities (DEPRECATED)"};
+cvar_t snd_entchannel5volume = {CVAR_SAVE, "snd_entchannel5volume", "1", "volume multiplier of the 5th entity channel of regular entities (DEPRECATED)"};
+cvar_t snd_entchannel6volume = {CVAR_SAVE, "snd_entchannel6volume", "1", "volume multiplier of the 6th entity channel of regular entities (DEPRECATED)"};
+cvar_t snd_entchannel7volume = {CVAR_SAVE, "snd_entchannel7volume", "1", "volume multiplier of the 7th entity channel of regular entities (DEPRECATED)"};
+cvar_t snd_playerchannel0volume = {CVAR_SAVE, "snd_playerchannel0volume", "1", "volume multiplier of the auto-allocate entity channel of player entities (DEPRECATED)"};
+cvar_t snd_playerchannel1volume = {CVAR_SAVE, "snd_playerchannel1volume", "1", "volume multiplier of the 1st entity channel of player entities (DEPRECATED)"};
+cvar_t snd_playerchannel2volume = {CVAR_SAVE, "snd_playerchannel2volume", "1", "volume multiplier of the 2nd entity channel of player entities (DEPRECATED)"};
+cvar_t snd_playerchannel3volume = {CVAR_SAVE, "snd_playerchannel3volume", "1", "volume multiplier of the 3rd entity channel of player entities (DEPRECATED)"};
+cvar_t snd_playerchannel4volume = {CVAR_SAVE, "snd_playerchannel4volume", "1", "volume multiplier of the 4th entity channel of player entities (DEPRECATED)"};
+cvar_t snd_playerchannel5volume = {CVAR_SAVE, "snd_playerchannel5volume", "1", "volume multiplier of the 5th entity channel of player entities (DEPRECATED)"};
+cvar_t snd_playerchannel6volume = {CVAR_SAVE, "snd_playerchannel6volume", "1", "volume multiplier of the 6th entity channel of player entities (DEPRECATED)"};
+cvar_t snd_playerchannel7volume = {CVAR_SAVE, "snd_playerchannel7volume", "1", "volume multiplier of the 7th entity channel of player entities (DEPRECATED)"};
+cvar_t snd_worldchannel0volume = {CVAR_SAVE, "snd_worldchannel0volume", "1", "volume multiplier of the auto-allocate entity channel of the world entity (DEPRECATED)"};
+cvar_t snd_worldchannel1volume = {CVAR_SAVE, "snd_worldchannel1volume", "1", "volume multiplier of the 1st entity channel of the world entity (DEPRECATED)"};
+cvar_t snd_worldchannel2volume = {CVAR_SAVE, "snd_worldchannel2volume", "1", "volume multiplier of the 2nd entity channel of the world entity (DEPRECATED)"};
+cvar_t snd_worldchannel3volume = {CVAR_SAVE, "snd_worldchannel3volume", "1", "volume multiplier of the 3rd entity channel of the world entity (DEPRECATED)"};
+cvar_t snd_worldchannel4volume = {CVAR_SAVE, "snd_worldchannel4volume", "1", "volume multiplier of the 4th entity channel of the world entity (DEPRECATED)"};
+cvar_t snd_worldchannel5volume = {CVAR_SAVE, "snd_worldchannel5volume", "1", "volume multiplier of the 5th entity channel of the world entity (DEPRECATED)"};
+cvar_t snd_worldchannel6volume = {CVAR_SAVE, "snd_worldchannel6volume", "1", "volume multiplier of the 6th entity channel of the world entity (DEPRECATED)"};
+cvar_t snd_worldchannel7volume = {CVAR_SAVE, "snd_worldchannel7volume", "1", "volume multiplier of the 7th entity channel of the world entity (DEPRECATED)"};
+cvar_t snd_csqcchannel0volume = {CVAR_SAVE, "snd_csqcchannel0volume", "1", "volume multiplier of the auto-allocate entity channel CSQC entities (DEPRECATED)"};
+cvar_t snd_csqcchannel1volume = {CVAR_SAVE, "snd_csqcchannel1volume", "1", "volume multiplier of the 1st entity channel of CSQC entities (DEPRECATED)"};
+cvar_t snd_csqcchannel2volume = {CVAR_SAVE, "snd_csqcchannel2volume", "1", "volume multiplier of the 2nd entity channel of CSQC entities (DEPRECATED)"};
+cvar_t snd_csqcchannel3volume = {CVAR_SAVE, "snd_csqcchannel3volume", "1", "volume multiplier of the 3rd entity channel of CSQC entities (DEPRECATED)"};
+cvar_t snd_csqcchannel4volume = {CVAR_SAVE, "snd_csqcchannel4volume", "1", "volume multiplier of the 4th entity channel of CSQC entities (DEPRECATED)"};
+cvar_t snd_csqcchannel5volume = {CVAR_SAVE, "snd_csqcchannel5volume", "1", "volume multiplier of the 5th entity channel of CSQC entities (DEPRECATED)"};
+cvar_t snd_csqcchannel6volume = {CVAR_SAVE, "snd_csqcchannel6volume", "1", "volume multiplier of the 6th entity channel of CSQC entities (DEPRECATED)"};
+cvar_t snd_csqcchannel7volume = {CVAR_SAVE, "snd_csqcchannel7volume", "1", "volume multiplier of the 7th entity channel of CSQC entities (DEPRECATED)"};
+cvar_t snd_channel0volume = {CVAR_SAVE, "snd_channel0volume", "1", "volume multiplier of the auto-allocate entity channel"};
+cvar_t snd_channel1volume = {CVAR_SAVE, "snd_channel1volume", "1", "volume multiplier of the 1st entity channel"};
+cvar_t snd_channel2volume = {CVAR_SAVE, "snd_channel2volume", "1", "volume multiplier of the 2nd entity channel"};
+cvar_t snd_channel3volume = {CVAR_SAVE, "snd_channel3volume", "1", "volume multiplier of the 3rd entity channel"};
+cvar_t snd_channel4volume = {CVAR_SAVE, "snd_channel4volume", "1", "volume multiplier of the 4th entity channel"};
+cvar_t snd_channel5volume = {CVAR_SAVE, "snd_channel5volume", "1", "volume multiplier of the 5th entity channel"};
+cvar_t snd_channel6volume = {CVAR_SAVE, "snd_channel6volume", "1", "volume multiplier of the 6th entity channel"};
+cvar_t snd_channel7volume = {CVAR_SAVE, "snd_channel7volume", "1", "volume multiplier of the 7th entity channel"};
// Local cvars
static cvar_t nosound = {0, "nosound", "0", "disables sound"};
// (48KHz because a lot of onboard sound cards sucks at any other speed)
static cvar_t snd_speed = {CVAR_SAVE, "snd_speed", "48000", "sound output frequency, in hertz"};
static cvar_t snd_width = {CVAR_SAVE, "snd_width", "2", "sound output precision, in bytes (1 and 2 supported)"};
-static cvar_t snd_channels = {CVAR_SAVE, "snd_channels", "2", "number of channels for the sound ouput (2 for stereo; up to 8 supported for 3D sound)"};
+static cvar_t snd_channels = {CVAR_SAVE, "snd_channels", "2", "number of channels for the sound output (2 for stereo; up to 8 supported for 3D sound)"};
+
+static cvar_t snd_startloopingsounds = {0, "snd_startloopingsounds", "1", "whether to start sounds that would loop (you want this to be 1); existing sounds are not affected"};
+static cvar_t snd_startnonloopingsounds = {0, "snd_startnonloopingsounds", "1", "whether to start sounds that would not loop (you want this to be 1); existing sounds are not affected"};
// Ambient sounds
static sfx_t* ambient_sfxs [2] = { NULL, NULL };
i++;
}
- sfx = S_PrecacheSound (name, true, false);
+ sfx = S_PrecacheSound (name, true, true);
if (sfx)
{
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;
size = sfx->memsize;
format = sfx->fetcher->getfmt(sfx);
- Con_Printf ("%c%c%c%c(%2db, %6s) %8i : %s\n",
- (sfx->loopstart >= 0) ? 'L' : ' ',
+ Con_Printf ("%c%c%c(%2db, %6s) %8i : %s\n",
+ (sfx->loopstart < sfx->total_length) ? 'L' : ' ',
(sfx->flags & SFXFLAG_STREAMED) ? 'S' : ' ',
- (sfx->locks > 0) ? 'K' : ' ',
- (sfx->flags & SFXFLAG_PERMANENTLOCK) ? 'P' : ' ',
+ (sfx->flags & SFXFLAG_MENUSOUND) ? 'P' : ' ',
format->width * 8,
(format->channels == 1) ? "mono" : "stereo",
size,
return snd_renderbuffer ? snd_renderbuffer->format.speed : 0;
}
+int S_GetSoundChannels(void)
+{
+ return snd_renderbuffer ? snd_renderbuffer->format.channels : 0;
+}
+
static qboolean S_ChooseCheaperFormat (snd_format_t* format, qboolean fixed_speed, qboolean fixed_width, qboolean fixed_channels)
{
{ 22050, 2, 2 },
{ 44100, 2, 2 },
{ 48000, 2, 6 },
+ { 96000, 2, 6 },
{ SND_MAX_SPEED, SND_MAX_WIDTH, SND_MAX_CHANNELS },
};
const unsigned int nb_thresholds = sizeof(thresholds) / sizeof(thresholds[0]);
listeners = snd_speakerlayout.listeners;
// Swap the left and right channels if snd_swapstereo is set
- if (snd_swapstereo.integer)
+ if (boolxor(snd_swapstereo.integer, v_flipped.integer))
{
switch (snd_speakerlayout.channels)
{
(layout == SND_CHANNELLAYOUT_ALSA) ? "ALSA" : "standard");
}
- current_swapstereo = snd_swapstereo.integer;
+ current_swapstereo = boolxor(snd_swapstereo.integer, v_flipped.integer);
current_channellayout = snd_channellayout.integer;
current_channellayout_used = layout;
}
qboolean fixed_speed, fixed_width, fixed_channels;
snd_format_t chosen_fmt;
static snd_format_t prev_render_format = {0, 0, 0};
- const char* env;
+ char* env;
+#if _MSC_VER >= 1400
+ size_t envlen;
+#endif
int i;
if (!snd_initialized.integer)
chosen_fmt.channels = snd_channels.integer;
// Check the environment variables to see if the player wants a particular sound format
+#if _MSC_VER >= 1400
+ _dupenv_s(&env, &envlen, "QUAKE_SOUND_CHANNELS");
+#else
env = getenv("QUAKE_SOUND_CHANNELS");
+#endif
if (env != NULL)
{
chosen_fmt.channels = atoi (env);
+#if _MSC_VER >= 1400
+ free(env);
+#endif
fixed_channels = true;
}
+#if _MSC_VER >= 1400
+ _dupenv_s(&env, &envlen, "QUAKE_SOUND_SPEED");
+#else
env = getenv("QUAKE_SOUND_SPEED");
+#endif
if (env != NULL)
{
chosen_fmt.speed = atoi (env);
+#if _MSC_VER >= 1400
+ free(env);
+#endif
fixed_speed = true;
}
+#if _MSC_VER >= 1400
+ _dupenv_s(&env, &envlen, "QUAKE_SOUND_SAMPLEBITS");
+#else
env = getenv("QUAKE_SOUND_SAMPLEBITS");
+#endif
if (env != NULL)
{
chosen_fmt.width = atoi (env) / 8;
+#if _MSC_VER >= 1400
+ free(env);
+#endif
fixed_width = true;
}
accepted = false;
do
{
- Con_DPrintf("S_Startup: initializing sound output format: %dHz, %d bit, %d channels...\n",
+ Con_Printf("S_Startup: initializing sound output format: %dHz, %d bit, %d channels...\n",
chosen_fmt.speed, chosen_fmt.width * 8,
chosen_fmt.channels);
if (!accepted)
{
- Con_DPrintf("S_Startup: sound output initialization FAILED\n");
+ Con_Printf("S_Startup: sound output initialization FAILED\n");
// If the module is suggesting another one
if (suggest_fmt.speed != 0)
// some modules write directly to a shared (DMA) buffer
extrasoundtime = oldpaintedtime + snd_renderbuffer->maxframes - 1;
extrasoundtime -= extrasoundtime % snd_renderbuffer->maxframes;
- Con_DPrintf("S_Startup: extra sound time = %u\n", extrasoundtime);
+ Con_Printf("S_Startup: extra sound time = %u\n", extrasoundtime);
soundtime = extrasoundtime;
}
void S_Restart_f(void)
{
+ // NOTE: we can't free all sounds if we are running a map (this frees sfx_t that are still referenced by precaches)
+ // So, refuse to do this if we are connected.
+ if(cls.state == ca_connected)
+ {
+ Con_Printf("snd_restart would wreak havoc if you do that while connected!\n");
+ return;
+ }
+
S_Shutdown();
S_Startup();
}
*/
void S_Init(void)
{
- Con_DPrint("\nSound Initialization\n");
-
Cvar_RegisterVariable(&volume);
Cvar_RegisterVariable(&bgmvolume);
+ Cvar_RegisterVariable(&mastervolume);
Cvar_RegisterVariable(&snd_staticvolume);
+ Cvar_RegisterVariable(&snd_entchannel0volume);
+ Cvar_RegisterVariable(&snd_entchannel1volume);
+ Cvar_RegisterVariable(&snd_entchannel2volume);
+ Cvar_RegisterVariable(&snd_entchannel3volume);
+ Cvar_RegisterVariable(&snd_entchannel4volume);
+ Cvar_RegisterVariable(&snd_entchannel5volume);
+ Cvar_RegisterVariable(&snd_entchannel6volume);
+ Cvar_RegisterVariable(&snd_entchannel7volume);
+ Cvar_RegisterVariable(&snd_worldchannel0volume);
+ Cvar_RegisterVariable(&snd_worldchannel1volume);
+ Cvar_RegisterVariable(&snd_worldchannel2volume);
+ Cvar_RegisterVariable(&snd_worldchannel3volume);
+ Cvar_RegisterVariable(&snd_worldchannel4volume);
+ Cvar_RegisterVariable(&snd_worldchannel5volume);
+ Cvar_RegisterVariable(&snd_worldchannel6volume);
+ Cvar_RegisterVariable(&snd_worldchannel7volume);
+ Cvar_RegisterVariable(&snd_playerchannel0volume);
+ Cvar_RegisterVariable(&snd_playerchannel1volume);
+ Cvar_RegisterVariable(&snd_playerchannel2volume);
+ Cvar_RegisterVariable(&snd_playerchannel3volume);
+ Cvar_RegisterVariable(&snd_playerchannel4volume);
+ Cvar_RegisterVariable(&snd_playerchannel5volume);
+ Cvar_RegisterVariable(&snd_playerchannel6volume);
+ Cvar_RegisterVariable(&snd_playerchannel7volume);
+ Cvar_RegisterVariable(&snd_csqcchannel0volume);
+ Cvar_RegisterVariable(&snd_csqcchannel1volume);
+ Cvar_RegisterVariable(&snd_csqcchannel2volume);
+ Cvar_RegisterVariable(&snd_csqcchannel3volume);
+ Cvar_RegisterVariable(&snd_csqcchannel4volume);
+ Cvar_RegisterVariable(&snd_csqcchannel5volume);
+ Cvar_RegisterVariable(&snd_csqcchannel6volume);
+ Cvar_RegisterVariable(&snd_csqcchannel7volume);
+ Cvar_RegisterVariable(&snd_channel0volume);
+ Cvar_RegisterVariable(&snd_channel1volume);
+ Cvar_RegisterVariable(&snd_channel2volume);
+ Cvar_RegisterVariable(&snd_channel3volume);
+ Cvar_RegisterVariable(&snd_channel4volume);
+ Cvar_RegisterVariable(&snd_channel5volume);
+ Cvar_RegisterVariable(&snd_channel6volume);
+ Cvar_RegisterVariable(&snd_channel7volume);
+
+ Cvar_RegisterVariable(&snd_spatialization_min_radius);
+ Cvar_RegisterVariable(&snd_spatialization_max_radius);
+ Cvar_RegisterVariable(&snd_spatialization_min);
+ Cvar_RegisterVariable(&snd_spatialization_max);
+ Cvar_RegisterVariable(&snd_spatialization_power);
+ Cvar_RegisterVariable(&snd_spatialization_control);
+ Cvar_RegisterVariable(&snd_spatialization_occlusion);
+ Cvar_RegisterVariable(&snd_spatialization_prologic);
+ Cvar_RegisterVariable(&snd_spatialization_prologic_frontangle);
Cvar_RegisterVariable(&snd_speed);
Cvar_RegisterVariable(&snd_width);
Cvar_RegisterVariable(&snd_channels);
+ Cvar_RegisterVariable(&snd_mutewhenidle);
+
+ Cvar_RegisterVariable(&snd_startloopingsounds);
+ Cvar_RegisterVariable(&snd_startnonloopingsounds);
// COMMANDLINEOPTION: Sound: -nosound disables sound (including CD audio)
- if (COM_CheckParm("-nosound") || COM_CheckParm("-safe"))
+ if (COM_CheckParm("-nosound"))
+ {
+ // dummy out Play and Play2 because mods stuffcmd that
+ Cmd_AddCommand("play", Host_NoOperation_f, "does nothing because -nosound was specified");
+ Cmd_AddCommand("play2", Host_NoOperation_f, "does nothing because -nosound was specified");
return;
+ }
snd_mempool = Mem_AllocPool("sound", 0, NULL);
Cmd_AddCommand("soundlist", S_SoundList_f, "list loaded sounds");
Cmd_AddCommand("soundinfo", S_SoundInfo_f, "print sound system information (such as channels and speed)");
Cmd_AddCommand("snd_restart", S_Restart_f, "restart sound system");
- Cmd_AddCommand("snd_reload", S_Reload_f, "reload all sound files");
+ Cmd_AddCommand("snd_unloadallsounds", S_UnloadAllSounds_f, "unload all sound files");
Cvar_RegisterVariable(&nosound);
Cvar_RegisterVariable(&snd_precache);
memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
OGG_OpenLibrary ();
+ ModPlug_OpenLibrary ();
}
void S_Terminate (void)
{
S_Shutdown ();
+ ModPlug_CloseLibrary ();
OGG_CloseLibrary ();
// Free all SFXs
/*
==================
-S_Reload_f
+S_UnloadAllSounds_f
==================
*/
-void S_Reload_f (void)
+void S_UnloadAllSounds_f (void)
{
int i;
+ // NOTE: we can't free all sounds if we are running a map (this frees sfx_t that are still referenced by precaches)
+ // So, refuse to do this if we are connected.
+ if(cls.state == ca_connected)
+ {
+ Con_Printf("snd_unloadallsounds would wreak havoc if you do that while connected!\n");
+ return;
+ }
+
// stop any active sounds
S_StopAllSounds();
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);
{
unsigned int i;
- // Never free a locked sfx unless forced
- if (!force && (sfx->locks > 0 || (sfx->flags & SFXFLAG_PERMANENTLOCK)))
+ // Do not free a precached sound during purge
+ if (!force && (sfx->flags & (SFXFLAG_LEVELSOUND | SFXFLAG_MENUSOUND)))
return;
- Con_DPrintf ("S_FreeSfx: freeing %s\n", sfx->name);
+ if (developer_loading.integer)
+ Con_Printf ("unloading sound %s\n", sfx->name);
// Remove it from the list of known sfx
if (sfx == known_sfx)
// Stop all channels using this sfx
for (i = 0; i < total_channels; i++)
+ {
if (channels[i].sfx == sfx)
- S_StopChannel (i);
+ {
+ Con_Printf("S_FreeSfx: stopping channel %i for sfx \"%s\"\n", i, sfx->name);
+ S_StopChannel (i, true, false);
+ }
+ }
// Free it
if (sfx->fetcher != NULL && sfx->fetcher->free != NULL)
- sfx->fetcher->free (sfx);
+ sfx->fetcher->free (sfx->fetcher_data);
Mem_Free (sfx);
}
/*
==================
-S_ServerSounds
+S_ClearUsed
==================
*/
-void S_ServerSounds (char serversound [][MAX_QPATH], unsigned int numsounds)
+void S_ClearUsed (void)
{
sfx_t *sfx;
- sfx_t *sfxnext;
+// sfx_t *sfxnext;
unsigned int i;
// Start the ambient sounds and make them loop
for (i = 0; i < sizeof (ambient_sfxs) / sizeof (ambient_sfxs[0]); i++)
{
- // Precache it if it's not done (request a lock to make sure it will never be freed)
+ // Precache it if it's not done (and pass false for levelsound because these are permanent)
if (ambient_sfxs[i] == NULL)
- ambient_sfxs[i] = S_PrecacheSound (ambient_names[i], false, true);
+ ambient_sfxs[i] = S_PrecacheSound (ambient_names[i], false, false);
if (ambient_sfxs[i] != NULL)
{
- // Add a lock to the SFX while playing. It will be
- // removed by S_StopAllSounds at the end of the level
- S_LockSfx (ambient_sfxs[i]);
-
channels[i].sfx = ambient_sfxs[i];
+ channels[i].sfx->flags |= SFXFLAG_MENUSOUND;
channels[i].flags |= CHANNELFLAG_FORCELOOP;
channels[i].master_vol = 0;
}
}
- // Remove 1 lock from all sfx with the SFXFLAG_SERVERSOUND flag, and remove the flag
+ // Clear SFXFLAG_LEVELSOUND flag so that sounds not precached this level will be purged
for (sfx = known_sfx; sfx != NULL; sfx = sfx->next)
- if (sfx->flags & SFXFLAG_SERVERSOUND)
- {
- S_UnlockSfx (sfx);
- sfx->flags &= ~SFXFLAG_SERVERSOUND;
- }
+ sfx->flags &= ~SFXFLAG_LEVELSOUND;
+}
- // Add 1 lock and the SFXFLAG_SERVERSOUND flag to each sfx in "serversound"
- for (i = 1; i < numsounds; i++)
- {
- sfx = S_FindName (serversound[i]);
- if (sfx != NULL)
- {
- S_LockSfx (sfx);
- sfx->flags |= SFXFLAG_SERVERSOUND;
- }
- }
+/*
+==================
+S_PurgeUnused
+==================
+*/
+void S_PurgeUnused(void)
+{
+ sfx_t *sfx;
+ sfx_t *sfxnext;
- // Free all unlocked sfx
+ // Free all not-precached per-level sfx
for (sfx = known_sfx;sfx;sfx = sfxnext)
{
sfxnext = sfx->next;
- S_FreeSfx (sfx, false);
+ if (!(sfx->flags & (SFXFLAG_LEVELSOUND | SFXFLAG_MENUSOUND)))
+ S_FreeSfx (sfx, false);
}
}
S_PrecacheSound
==================
*/
-sfx_t *S_PrecacheSound (const char *name, qboolean complain, qboolean lock)
+sfx_t *S_PrecacheSound (const char *name, qboolean complain, qboolean levelsound)
{
sfx_t *sfx;
return NULL;
sfx = S_FindName (name);
+
if (sfx == NULL)
return NULL;
- if (lock)
- S_LockSfx (sfx);
+ // clear the FILEMISSING flag so that S_LoadSound will try again on a
+ // previously missing file
+ sfx->flags &= ~ SFXFLAG_FILEMISSING;
+
+ // set a flag to indicate this has been precached for this level or permanently
+ if (levelsound)
+ sfx->flags |= SFXFLAG_LEVELSOUND;
+ else
+ sfx->flags |= SFXFLAG_MENUSOUND;
if (!nosound.integer && snd_precache.integer)
S_LoadSound(sfx, complain);
/*
==================
-S_IsSoundPrecached
+S_SoundLength
==================
*/
-qboolean S_IsSoundPrecached (const sfx_t *sfx)
+
+float S_SoundLength(const char *name)
{
- return (sfx != NULL && sfx->fetcher != NULL);
-}
+ sfx_t *sfx;
-/*
-==================
-S_LockSfx
+ if (!snd_initialized.integer)
+ return -1;
+ if (name == NULL || name[0] == 0)
+ return -1;
-Add a lock to a SFX
-==================
-*/
-void S_LockSfx (sfx_t *sfx)
-{
- sfx->locks++;
+ sfx = S_FindName(name);
+ if (sfx == NULL)
+ return -1;
+ return sfx->total_length / (float) S_GetSoundRate();
}
/*
==================
-S_UnlockSfx
-
-Remove a lock from a SFX
+S_IsSoundPrecached
==================
*/
-void S_UnlockSfx (sfx_t *sfx)
+qboolean S_IsSoundPrecached (const sfx_t *sfx)
{
- sfx->locks--;
+ return (sfx != NULL && sfx->fetcher != NULL) || (sfx == &changevolume_sfx);
}
-
/*
==================
S_BlockSound
int first_to_die;
int first_life_left, life_left;
channel_t* ch;
+ sfx_t *sfx; // use this instead of ch->sfx->, because that is volatile.
// Check for replacement sound, or find the best one to replace
first_to_die = -1;
first_life_left = 0x7fffffff;
- for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++)
+
+ // entity channels try to replace the existing sound on the channel
+ // channels <= 0 are autochannels
+ if (IS_CHAN_SINGLE(entchannel))
{
- ch = &channels[ch_idx];
- if (entchannel != 0)
+ for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++)
{
- // try to override an existing channel
- if (ch->entnum == entnum && (ch->entchannel == entchannel || entchannel == -1) )
+ ch = &channels[ch_idx];
+ if (ch->entnum == entnum && ch->entchannel == entchannel)
{
// always override sound from same entity
- first_to_die = ch_idx;
- break;
+ S_StopChannel (ch_idx, true, false);
+ return &channels[ch_idx];
}
}
- else
+ }
+
+ // there was no channel to override, so look for the first empty one
+ for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++)
+ {
+ ch = &channels[ch_idx];
+ sfx = ch->sfx; // fetch the volatile variable
+ if (!sfx)
{
- if (!ch->sfx)
- {
- // no sound on this channel
- first_to_die = ch_idx;
- break;
- }
+ // no sound on this channel
+ first_to_die = ch_idx;
+ goto emptychan_found;
}
- if (ch->sfx)
- {
- // don't let monster sounds override player sounds
- if (ch->entnum == cl.viewentity && entnum != cl.viewentity)
- continue;
+ // don't let monster sounds override player sounds
+ if (ch->entnum == cl.viewentity && entnum != cl.viewentity)
+ continue;
- // don't override looped sounds
- if ((ch->flags & CHANNELFLAG_FORCELOOP) || ch->sfx->loopstart >= 0)
- continue;
- }
+ // don't override looped sounds
+ if ((ch->flags & CHANNELFLAG_FORCELOOP) || sfx->loopstart < sfx->total_length)
+ continue;
+ life_left = sfx->total_length - ch->pos;
- life_left = (int)(ch->end - snd_renderbuffer->endframe);
if (life_left < first_life_left)
{
first_life_left = life_left;
if (first_to_die == -1)
return NULL;
+
+ S_StopChannel (first_to_die, true, false);
- S_StopChannel (first_to_die);
-
+emptychan_found:
return &channels[first_to_die];
}
Spatializes a channel
=================
*/
-void SND_Spatialize(channel_t *ch, qboolean isstatic)
+extern cvar_t cl_gameplayfix_soundsmovewithentities;
+void SND_Spatialize_WithSfx(channel_t *ch, qboolean isstatic, sfx_t *sfx)
{
int i;
+ double f;
+ float angle_side, angle_front, angle_factor;
vec_t dist, mastervol, intensity, vol;
vec3_t source_vec;
// update sound origin if we know about the entity
- if (ch->entnum > 0 && cls.state == ca_connected && cl.entities[ch->entnum].state_current.active)
+ if (ch->entnum > 0 && cls.state == ca_connected && cl_gameplayfix_soundsmovewithentities.integer)
{
- //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] && cl.model_precache[cl.entities[ch->entnum].state_current.modelindex]->soundfromcenter)
- 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);
+ if (ch->entnum >= MAX_EDICTS)
+ {
+ //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 (ch->entnum > MAX_EDICTS)
+ if (!CL_VM_GetEntitySoundOrigin(ch->entnum, ch->origin))
+ ch->entnum = MAX_EDICTS; // entity was removed, disown sound
+ }
+ 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]);
+ 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);
+ }
}
mastervol = ch->master_vol;
+
// Adjust volume of static sounds
if (isstatic)
mastervol *= snd_staticvolume.value;
+ else if(!(ch->flags & CHANNELFLAG_FULLVOLUME)) // same as SND_PaintChannel uses
+ {
+ // old legacy separated cvars
+ if(ch->entnum >= MAX_EDICTS)
+ {
+ switch(ch->entchannel)
+ {
+ case 0: mastervol *= snd_csqcchannel0volume.value; break;
+ case 1: mastervol *= snd_csqcchannel1volume.value; break;
+ case 2: mastervol *= snd_csqcchannel2volume.value; break;
+ case 3: mastervol *= snd_csqcchannel3volume.value; break;
+ case 4: mastervol *= snd_csqcchannel4volume.value; break;
+ case 5: mastervol *= snd_csqcchannel5volume.value; break;
+ case 6: mastervol *= snd_csqcchannel6volume.value; break;
+ case 7: mastervol *= snd_csqcchannel7volume.value; break;
+ default: break;
+ }
+ }
+ else if(ch->entnum == 0)
+ {
+ switch(ch->entchannel)
+ {
+ case 0: mastervol *= snd_worldchannel0volume.value; break;
+ case 1: mastervol *= snd_worldchannel1volume.value; break;
+ case 2: mastervol *= snd_worldchannel2volume.value; break;
+ case 3: mastervol *= snd_worldchannel3volume.value; break;
+ case 4: mastervol *= snd_worldchannel4volume.value; break;
+ case 5: mastervol *= snd_worldchannel5volume.value; break;
+ case 6: mastervol *= snd_worldchannel6volume.value; break;
+ case 7: mastervol *= snd_worldchannel7volume.value; break;
+ default: break;
+ }
+ }
+ else if(ch->entnum > 0 && ch->entnum <= cl.maxclients)
+ {
+ switch(ch->entchannel)
+ {
+ case 0: mastervol *= snd_playerchannel0volume.value; break;
+ case 1: mastervol *= snd_playerchannel1volume.value; break;
+ case 2: mastervol *= snd_playerchannel2volume.value; break;
+ case 3: mastervol *= snd_playerchannel3volume.value; break;
+ case 4: mastervol *= snd_playerchannel4volume.value; break;
+ case 5: mastervol *= snd_playerchannel5volume.value; break;
+ case 6: mastervol *= snd_playerchannel6volume.value; break;
+ case 7: mastervol *= snd_playerchannel7volume.value; break;
+ default: break;
+ }
+ }
+ else
+ {
+ switch(ch->entchannel)
+ {
+ case 0: mastervol *= snd_entchannel0volume.value; break;
+ case 1: mastervol *= snd_entchannel1volume.value; break;
+ case 2: mastervol *= snd_entchannel2volume.value; break;
+ case 3: mastervol *= snd_entchannel3volume.value; break;
+ case 4: mastervol *= snd_entchannel4volume.value; break;
+ case 5: mastervol *= snd_entchannel5volume.value; break;
+ case 6: mastervol *= snd_entchannel6volume.value; break;
+ case 7: mastervol *= snd_entchannel7volume.value; break;
+ default: break;
+ }
+ }
+
+ switch(ch->entchannel)
+ {
+ case 0: mastervol *= snd_channel0volume.value; break;
+ case 1: mastervol *= snd_channel1volume.value; break;
+ case 2: mastervol *= snd_channel2volume.value; break;
+ case 3: mastervol *= snd_channel3volume.value; break;
+ case 4: mastervol *= snd_channel4volume.value; break;
+ case 5: mastervol *= snd_channel5volume.value; break;
+ case 6: mastervol *= snd_channel6volume.value; break;
+ case 7: mastervol *= snd_channel7volume.value; break;
+ default: mastervol *= Cvar_VariableValueOr(va("snd_channel%dvolume", CHAN_ENGINE2CVAR(ch->entchannel)), 1.0); break;
+ }
+ }
+
+ // If this channel does not manage its own volume (like CD tracks)
+ if (!(ch->flags & CHANNELFLAG_FULLVOLUME))
+ mastervol *= volume.value;
+
+ // clamp HERE to allow to go at most 10dB past mastervolume (before clamping), when mastervolume < -10dB (so relative volumes don't get too messy)
+ mastervol = bound(0, mastervol, 655360);
+
+ // always apply "master"
+ mastervol *= mastervolume.value;
+
+ // add in ReplayGain very late; prevent clipping when close
+ if(sfx)
+ if(sfx->volume_peak > 0)
+ {
+ // Replaygain support
+ // Con_DPrintf("Setting volume on ReplayGain-enabled track... %f -> ", fvol);
+ mastervol *= sfx->volume_mult;
+ if(mastervol * sfx->volume_peak > 65536)
+ mastervol = 65536 / sfx->volume_peak;
+ // Con_DPrintf("%f\n", fvol);
+ }
+
+ // clamp HERE to keep relative volumes of the channels correct
+ mastervol = bound(0, mastervol, 65536);
// 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)
{
- for (i = 0;i < SND_LISTENERS;i++)
+ ch->prologic_invert = 1;
+ if (snd_spatialization_prologic.integer != 0)
{
- vol = mastervol * snd_speakerlayout.listeners[i].ambientvolume;
- ch->listener_volume[i] = (int)bound(0, vol, 255);
+ vol = mastervol * snd_speakerlayout.listeners[0].ambientvolume * sqrt(0.5);
+ ch->listener_volume[0] = (int)bound(0, vol, 65536);
+ vol = mastervol * snd_speakerlayout.listeners[1].ambientvolume * sqrt(0.5);
+ ch->listener_volume[1] = (int)bound(0, vol, 65536);
+ for (i = 2;i < SND_LISTENERS;i++)
+ ch->listener_volume[i] = 0;
+ }
+ else
+ {
+ for (i = 0;i < SND_LISTENERS;i++)
+ {
+ vol = mastervol * snd_speakerlayout.listeners[i].ambientvolume;
+ ch->listener_volume[i] = (int)bound(0, vol, 65536);
+ }
}
}
else
intensity = mastervol * (1.0 - dist * ch->dist_mult);
if (intensity > 0)
{
- for (i = 0;i < SND_LISTENERS;i++)
+ qboolean occluded = false;
+ if (snd_spatialization_occlusion.integer)
{
- Matrix4x4_Transform(&listener_matrix[i], ch->origin, source_vec);
- VectorNormalize(source_vec);
- vol = intensity * max(0, source_vec[0] * snd_speakerlayout.listeners[i].dotscale + snd_speakerlayout.listeners[i].dotbias);
- ch->listener_volume[i] = (int)bound(0, vol, 255);
+ if(snd_spatialization_occlusion.integer & 1)
+ if(listener_pvs)
+ {
+ int cluster = cl.worldmodel->brush.PointInLeaf(cl.worldmodel, ch->origin)->clusterindex;
+ if(cluster >= 0 && cluster < 8 * listener_pvsbytes && !CHECKPVSBIT(listener_pvs, cluster))
+ occluded = true;
+ }
+
+ if(snd_spatialization_occlusion.integer & 2)
+ if(!occluded)
+ if(cl.worldmodel && cl.worldmodel->brush.TraceLineOfSight && !cl.worldmodel->brush.TraceLineOfSight(cl.worldmodel, listener_origin, ch->origin))
+ occluded = true;
+ }
+ if(occluded)
+ intensity *= 0.5;
+
+ ch->prologic_invert = 1;
+ if (snd_spatialization_prologic.integer != 0)
+ {
+ if (dist == 0)
+ angle_factor = 0.5;
+ else
+ {
+ Matrix4x4_Transform(&listener_basematrix, ch->origin, source_vec);
+ VectorNormalize(source_vec);
+
+ switch(spatialmethod)
+ {
+ case SPATIAL_LOG:
+ if(dist == 0)
+ f = spatialmin + spatialdiff * (spatialfactor < 0); // avoid log(0), but do the right thing
+ else
+ f = spatialmin + spatialdiff * bound(0, (log(dist) - spatialoffset) * spatialfactor, 1);
+ VectorScale(source_vec, f, source_vec);
+ break;
+ case SPATIAL_POW:
+ f = (pow(dist, spatialpower) - spatialoffset) * spatialfactor;
+ f = spatialmin + spatialdiff * bound(0, f, 1);
+ VectorScale(source_vec, f, source_vec);
+ break;
+ case SPATIAL_THRESH:
+ f = spatialmin + spatialdiff * (dist < spatialoffset);
+ VectorScale(source_vec, f, source_vec);
+ break;
+ case SPATIAL_NONE:
+ default:
+ break;
+ }
+
+ // the z axis needs to be removed and normalized because otherwise the volume would get lower as the sound source goes higher or lower then normal
+ source_vec[2] = 0;
+ VectorNormalize(source_vec);
+ angle_side = acos(source_vec[0]) / M_PI * 180; // angle between 0 and 180 degrees
+ angle_front = asin(source_vec[1]) / M_PI * 180; // angle between -90 and 90 degrees
+ if (angle_side > snd_spatialization_prologic_frontangle.value)
+ {
+ ch->prologic_invert = -1; // this will cause the right channel to do a 180 degrees phase shift (turning the sound wave upside down),
+ // but the best would be 90 degrees phase shift left and a -90 degrees phase shift right.
+ angle_factor = (angle_side - snd_spatialization_prologic_frontangle.value) / (360 - 2 * snd_spatialization_prologic_frontangle.value);
+ // angle_factor is between 0 and 1 and represents the angle range from the front left, to all the surround speakers (amount may vary,
+ // 1 in prologic I 2 in prologic II and 3 or 4 in prologic IIx) to the front right speaker.
+ if (angle_front > 0)
+ angle_factor = 1 - angle_factor;
+ }
+ else
+ angle_factor = angle_front / snd_spatialization_prologic_frontangle.value / 2.0 + 0.5;
+ //angle_factor is between 0 and 1 and represents the angle range from the front left to the center to the front right speaker
+ }
+
+ vol = intensity * sqrt(angle_factor);
+ ch->listener_volume[0] = (int)bound(0, vol, 65536);
+ vol = intensity * sqrt(1 - angle_factor);
+ ch->listener_volume[1] = (int)bound(0, vol, 65536);
+ for (i = 2;i < SND_LISTENERS;i++)
+ ch->listener_volume[i] = 0;
+ }
+ else
+ {
+ for (i = 0;i < SND_LISTENERS;i++)
+ {
+ Matrix4x4_Transform(&listener_matrix[i], ch->origin, source_vec);
+ VectorNormalize(source_vec);
+
+ switch(spatialmethod)
+ {
+ case SPATIAL_LOG:
+ if(dist == 0)
+ f = spatialmin + spatialdiff * (spatialfactor < 0); // avoid log(0), but do the right thing
+ else
+ f = spatialmin + spatialdiff * bound(0, (log(dist) - spatialoffset) * spatialfactor, 1);
+ VectorScale(source_vec, f, source_vec);
+ break;
+ case SPATIAL_POW:
+ f = (pow(dist, spatialpower) - spatialoffset) * spatialfactor;
+ f = spatialmin + spatialdiff * bound(0, f, 1);
+ VectorScale(source_vec, f, source_vec);
+ break;
+ case SPATIAL_THRESH:
+ f = spatialmin + spatialdiff * (dist < spatialoffset);
+ VectorScale(source_vec, f, source_vec);
+ break;
+ case SPATIAL_NONE:
+ default:
+ break;
+ }
+
+ vol = intensity * max(0, source_vec[0] * snd_speakerlayout.listeners[i].dotscale + snd_speakerlayout.listeners[i].dotbias);
+
+ ch->listener_volume[i] = (int)bound(0, vol, 65536);
+ }
}
}
else
ch->listener_volume[i] = 0;
}
}
+void SND_Spatialize(channel_t *ch, qboolean isstatic)
+{
+ sfx_t *sfx = ch->sfx;
+ SND_Spatialize_WithSfx(ch, isstatic, sfx);
+}
// =======================================================================
// 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)
+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)
+ {
+ Con_Printf("S_PlaySfxOnChannel called with NULL??\n");
+ return;
+ }
+
+ if ((sfx->loopstart < sfx->total_length) || (flags & CHANNELFLAG_FORCELOOP))
+ {
+ if(!snd_startloopingsounds.integer)
+ return;
+ }
+ else
+ {
+ if(!snd_startnonloopingsounds.integer)
+ return;
+ }
+
// Initialize the channel
+ // a crash was reported on an in-use channel, so check here...
+ if (target_chan->sfx)
+ {
+ int channelindex = (int)(target_chan - channels);
+ Con_Printf("S_PlaySfxOnChannel(%s): channel %i already in use?? Clearing.\n", sfx->name, channelindex);
+ S_StopChannel (channelindex, true, false);
+ }
+ // We MUST set sfx LAST because otherwise we could crash a threaded mixer
+ // (otherwise we'd have to call SndSys_LockRenderBuffer here)
memset (target_chan, 0, sizeof (*target_chan));
VectorCopy (origin, target_chan->origin);
- target_chan->master_vol = (int)(fvol * 255);
- target_chan->sfx = sfx;
- target_chan->end = snd_renderbuffer->endframe + sfx->total_length;
- target_chan->lastptime = snd_renderbuffer->endframe;
target_chan->flags = flags;
+ 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 == -1)
+ 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;
- // Lock the SFX during play
- S_LockSfx (sfx);
+ // set the listener volumes
+ S_SetChannelVolume(target_chan - channels, fvol);
+ SND_Spatialize_WithSfx (target_chan, isstatic, sfx);
+
+ // finally, set the sfx pointer, so the channel becomes valid for playback
+ // and will be noticed by the mixer
+ target_chan->sfx = sfx;
}
-int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
+int S_StartSound_StartPosition_Flags (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation, float startposition, int flags)
{
- channel_t *target_chan, *check;
- int ch_idx;
- int skip;
+ channel_t *target_chan, *check, *ch;
+ int ch_idx, startpos;
if (snd_renderbuffer == NULL || sfx == NULL || nosound.integer)
return -1;
- if (sfx->fetcher == NULL)
+ if(sfx == &changevolume_sfx)
+ {
+ if (!IS_CHAN_SINGLE(entchannel))
+ 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)
+ {
+ S_SetChannelVolume(ch_idx, fvol);
+ ch->dist_mult = attenuation / snd_soundradius.value;
+ SND_Spatialize(ch, false);
+ return ch_idx;
+ }
+ }
return -1;
+ }
- if (entnum && entnum >= cl.max_entities)
- CL_ExpandEntities(entnum);
+ if (sfx->fetcher == NULL)
+ return -1;
// Pick a channel to play on
target_chan = SND_PickChannel(entnum, entchannel);
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];
- for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++, check++)
+ startpos = (int)(startposition * S_GetSoundRate());
+ if (startpos == 0)
{
- if (check == target_chan)
- continue;
- if (check->sfx == sfx && !check->pos)
+ for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++, check++)
{
- skip = (int)(0.1 * snd_renderbuffer->format.speed);
- if (skip > (int)sfx->total_length)
- skip = (int)sfx->total_length;
- if (skip > 0)
- skip = rand() % skip;
- target_chan->pos += skip;
- target_chan->end -= skip;
- break;
+ if (check == target_chan)
+ continue;
+ if (check->sfx == sfx && check->pos == 0)
+ {
+ // use negative pos offset to delay this sound effect
+ startpos = (int)lhrandom(0, -0.1 * snd_renderbuffer->format.speed);
+ break;
+ }
}
}
+ S_PlaySfxOnChannel (sfx, target_chan, flags, origin, fvol, attenuation, false, entnum, entchannel, startpos);
+
return (target_chan - channels);
}
-void S_StopChannel (unsigned int channel_ind)
+int S_StartSound_StartPosition (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation, float startposition)
+{
+ return S_StartSound_StartPosition_Flags(entnum, entchannel, sfx, origin, fvol, attenuation, startposition, CHANNELFLAG_NONE);
+}
+
+int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
+{
+ return S_StartSound_StartPosition(entnum, entchannel, sfx, origin, fvol, attenuation, 0);
+}
+
+void S_StopChannel (unsigned int channel_ind, qboolean lockmutex, qboolean freesfx)
{
channel_t *ch;
+ sfx_t *sfx;
if (channel_ind >= total_channels)
return;
+ // we have to lock an audio mutex to prevent crashes if an audio mixer
+ // thread is currently mixing this channel
+ // the SndSys_LockRenderBuffer function uses such a mutex in
+ // threaded sound backends
+ if (lockmutex && !simsound)
+ SndSys_LockRenderBuffer();
+
ch = &channels[channel_ind];
+ sfx = ch->sfx;
if (ch->sfx != NULL)
{
- sfx_t *sfx = ch->sfx;
-
if (sfx->fetcher != NULL)
{
snd_fetcher_endsb_t fetcher_endsb = sfx->fetcher->endsb;
if (fetcher_endsb != NULL)
- fetcher_endsb (ch);
+ fetcher_endsb (ch->fetcher_data);
}
- // Remove the lock it holds
- S_UnlockSfx (sfx);
-
+ ch->fetcher_data = NULL;
ch->sfx = NULL;
}
- ch->end = 0;
+ if (lockmutex && !simsound)
+ SndSys_UnlockRenderBuffer();
+ if (freesfx)
+ S_FreeSfx(sfx, true);
}
if (flag != CHANNELFLAG_FORCELOOP &&
flag != CHANNELFLAG_PAUSED &&
- flag != CHANNELFLAG_FULLVOLUME)
+ flag != CHANNELFLAG_FULLVOLUME &&
+ flag != CHANNELFLAG_LOCALSOUND)
return false;
if (value)
for (i = 0; i < MAX_DYNAMIC_CHANNELS; i++)
if (channels[i].entnum == entnum && channels[i].entchannel == entchannel)
{
- S_StopChannel (i);
+ S_StopChannel (i, true, false);
return;
}
}
// stop CD audio because it may be using a faketrack
CDAudio_Stop();
- for (i = 0; i < total_channels; i++)
- S_StopChannel (i);
-
- total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS; // no statics
- memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
-
- // Mute the contents of the submittion buffer
if (simsound || SndSys_LockRenderBuffer ())
{
int clear;
size_t memsize;
+ for (i = 0; i < total_channels; i++)
+ if (channels[i].sfx)
+ S_StopChannel (i, false, false);
+
+ total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS; // no statics
+ memset(channels, 0, MAX_CHANNELS * sizeof(channel_t));
+
+ // Mute the contents of the submittion buffer
clear = (snd_renderbuffer->format.width == 1) ? 0x80 : 0;
memsize = snd_renderbuffer->maxframes * snd_renderbuffer->format.width * snd_renderbuffer->format.channels;
memset(snd_renderbuffer->ring, clear, memsize);
}
}
-void S_SetChannelVolume (unsigned int ch_ind, float fvol)
+void S_SetChannelVolume(unsigned int ch_ind, float fvol)
{
- channels[ch_ind].master_vol = (int)(fvol * 255.0f);
+ channels[ch_ind].master_vol = (int)(fvol * 65536.0f);
}
+float S_GetChannelPosition (unsigned int ch_ind)
+{
+ // note: this is NOT accurate yet
+ int s;
+ channel_t *ch = &channels[ch_ind];
+ sfx_t *sfx = ch->sfx;
+ if (!sfx)
+ return -1;
+
+ s = ch->pos;
+ /*
+ if(!snd_usethreadedmixing)
+ s += _snd_mixahead.value * S_GetSoundRate();
+ */
+ return (s % sfx->total_length) / (float) S_GetSoundRate();
+}
+
+float S_GetEntChannelPosition(int entnum, int entchannel)
+{
+ channel_t *ch;
+ unsigned int i;
+
+ for (i = 0; i < total_channels; i++)
+ {
+ ch = &channels[i];
+ if (ch->entnum == entnum && ch->entchannel == entchannel)
+ return S_GetChannelPosition(i);
+ }
+ return -1; // no playing sound in this channel
+}
/*
=================
return;
if (!sfx->fetcher)
{
- Con_DPrintf ("S_StaticSound: \"%s\" hasn't been precached\n", sfx->name);
+ Con_Printf ("S_StaticSound: \"%s\" hasn't been precached\n", sfx->name);
return;
}
}
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);
}
int ambient_channel;
channel_t *chan;
unsigned char ambientlevels[NUM_AMBIENTS];
+ sfx_t *sfx;
memset(ambientlevels, 0, sizeof(ambientlevels));
if (cl.worldmodel && cl.worldmodel->brush.AmbientSoundLevelsForPoint)
for (ambient_channel = 0 ; ambient_channel< NUM_AMBIENTS ; ambient_channel++)
{
chan = &channels[ambient_channel];
- if (chan->sfx == NULL || chan->sfx->fetcher == NULL)
+ sfx = chan->sfx; // fetch the volatile variable
+ if (sfx == NULL || sfx->fetcher == NULL)
continue;
vol = (int)ambientlevels[ambient_channel];
if (vol < 8)
vol = 0;
+ vol *= 256;
// Don't adjust volume too fast
// FIXME: this rounds off to an int each frame, meaning there is little to no fade at extremely high framerates!
- if (chan->master_vol < vol)
+ if (cl.time > cl.oldtime)
{
- chan->master_vol += (int)(cl.realframetime * ambient_fade.value);
- if (chan->master_vol > vol)
- chan->master_vol = vol;
- }
- else if (chan->master_vol > vol)
- {
- chan->master_vol -= (int)(cl.realframetime * ambient_fade.value);
if (chan->master_vol < vol)
- chan->master_vol = vol;
+ {
+ chan->master_vol += (int)((cl.time - cl.oldtime) * 256.0 * ambient_fade.value);
+ if (chan->master_vol > vol)
+ chan->master_vol = vol;
+ }
+ else if (chan->master_vol > vol)
+ {
+ chan->master_vol -= (int)((cl.time - cl.oldtime) * 256.0 * ambient_fade.value);
+ if (chan->master_vol < vol)
+ chan->master_vol = vol;
+ }
}
- for (i = 0;i < SND_LISTENERS;i++)
- chan->listener_volume[i] = (int)(chan->master_vol * ambient_level.value * snd_speakerlayout.listeners[i].ambientvolume);
+ if (snd_spatialization_prologic.integer != 0)
+ {
+ chan->listener_volume[0] = (int)bound(0, chan->master_vol * ambient_level.value * volume.value * mastervolume.value * snd_speakerlayout.listeners[0].ambientvolume * sqrt(0.5), 65536);
+ chan->listener_volume[1] = (int)bound(0, chan->master_vol * ambient_level.value * volume.value * mastervolume.value * snd_speakerlayout.listeners[1].ambientvolume * sqrt(0.5), 65536);
+ for (i = 2;i < SND_LISTENERS;i++)
+ chan->listener_volume[i] = 0;
+ }
+ else
+ {
+ for (i = 0;i < SND_LISTENERS;i++)
+ chan->listener_volume[i] = (int)bound(0, chan->master_vol * ambient_level.value * volume.value * mastervolume.value * snd_speakerlayout.listeners[i].ambientvolume, 65536);
+ }
}
}
static void S_PaintAndSubmit (void)
{
unsigned int newsoundtime, paintedtime, endtime, maxtime, usedframes;
+ int usesoundtimehack;
+ static int soundtimehack = -1;
+ static int oldsoundtime = 0;
if (snd_renderbuffer == NULL || nosound.integer)
return;
- if (snd_blocked > 0 && !(cls.capturevideo.soundrate && !cls.capturevideo.realtime))
- return;
-
// Update sound time
- if (cls.capturevideo.soundrate && !cls.capturevideo.realtime) // SUPER NASTY HACK to record non-realtime sound
+ snd_usethreadedmixing = false;
+ usesoundtimehack = true;
+ if (cls.timedemo) // SUPER NASTY HACK to mix non-realtime sound for more reliable benchmarking
+ {
+ usesoundtimehack = 1;
+ newsoundtime = (unsigned int)((double)cl.mtime[0] * (double)snd_renderbuffer->format.speed);
+ }
+ else if (cls.capturevideo.soundrate && !cls.capturevideo.realtime) // SUPER NASTY HACK to record non-realtime sound
+ {
+ usesoundtimehack = 2;
newsoundtime = (unsigned int)((double)cls.capturevideo.frame * (double)snd_renderbuffer->format.speed / (double)cls.capturevideo.framerate);
+ }
else if (simsound)
+ {
+ usesoundtimehack = 3;
newsoundtime = (unsigned int)((realtime - snd_starttime) * (double)snd_renderbuffer->format.speed);
+ }
else
+ {
+ snd_usethreadedmixing = snd_threaded && !cls.capturevideo.soundrate;
+ usesoundtimehack = 0;
newsoundtime = SndSys_GetSoundTime();
+ }
+ // if the soundtimehack state changes we need to reset the soundtime
+ if (soundtimehack != usesoundtimehack)
+ {
+ snd_renderbuffer->startframe = snd_renderbuffer->endframe = soundtime = newsoundtime;
+
+ // Mute the contents of the submission buffer
+ if (simsound || SndSys_LockRenderBuffer ())
+ {
+ int clear;
+ size_t memsize;
+
+ clear = (snd_renderbuffer->format.width == 1) ? 0x80 : 0;
+ memsize = snd_renderbuffer->maxframes * snd_renderbuffer->format.width * snd_renderbuffer->format.channels;
+ memset(snd_renderbuffer->ring, clear, memsize);
+
+ if (!simsound)
+ SndSys_UnlockRenderBuffer ();
+ }
+ }
+ soundtimehack = usesoundtimehack;
+
+ if (!soundtimehack && snd_blocked > 0)
+ return;
+
+ if (snd_usethreadedmixing)
+ return; // the audio thread will mix its own data
newsoundtime += extrasoundtime;
if (newsoundtime < soundtime)
Con_DPrintf("S_PaintAndSubmit: new extra sound time = %u\n",
extrasoundtime);
}
- else
+ else if (!soundtimehack)
Con_Printf("S_PaintAndSubmit: WARNING: newsoundtime < soundtime (%u < %u)\n",
newsoundtime, soundtime);
}
soundtime = newsoundtime;
recording_sound = (cls.capturevideo.soundrate != 0);
+ // Lock submitbuffer
+ if (!simsound && !SndSys_LockRenderBuffer())
+ {
+ // If the lock failed, stop here
+ Con_DPrint(">> S_PaintAndSubmit: SndSys_LockRenderBuffer() failed\n");
+ return;
+ }
+
// Check to make sure that we haven't overshot
paintedtime = snd_renderbuffer->endframe;
if (paintedtime < soundtime)
paintedtime = soundtime;
// mix ahead of current position
- endtime = soundtime + (unsigned int)(_snd_mixahead.value * (float)snd_renderbuffer->format.speed);
+ if (soundtimehack)
+ endtime = soundtime + (unsigned int)(_snd_mixahead.value * (float)snd_renderbuffer->format.speed);
+ else
+ endtime = soundtime + (unsigned int)(max(_snd_mixahead.value * (float)snd_renderbuffer->format.speed, min(3 * (soundtime - oldsoundtime), 0.3 * (float)snd_renderbuffer->format.speed)));
usedframes = snd_renderbuffer->endframe - snd_renderbuffer->startframe;
maxtime = paintedtime + snd_renderbuffer->maxframes - usedframes;
endtime = min(endtime, maxtime);
- S_PaintChannels(snd_renderbuffer, paintedtime, endtime);
+ while (paintedtime < endtime)
+ {
+ unsigned int startoffset;
+ unsigned int nbframes;
+
+ // see how much we can fit in the paint buffer
+ nbframes = endtime - paintedtime;
+ // limit to the end of the ring buffer (in case of wrapping)
+ startoffset = paintedtime % snd_renderbuffer->maxframes;
+ nbframes = min(nbframes, snd_renderbuffer->maxframes - startoffset);
+
+ // mix into the buffer
+ S_MixToBuffer(&snd_renderbuffer->ring[startoffset * snd_renderbuffer->format.width * snd_renderbuffer->format.channels], nbframes);
+
+ paintedtime += nbframes;
+ snd_renderbuffer->endframe = paintedtime;
+ }
+ if (!simsound)
+ SndSys_UnlockRenderBuffer();
+
+ // Remove outdated samples from the ring buffer, if any
+ if (snd_renderbuffer->startframe < soundtime)
+ snd_renderbuffer->startframe = soundtime;
if (simsound)
snd_renderbuffer->startframe = snd_renderbuffer->endframe;
else
SndSys_Submit();
+
+ oldsoundtime = soundtime;
+
+ cls.soundstats.latency_milliseconds = (snd_renderbuffer->endframe - snd_renderbuffer->startframe) * 1000 / snd_renderbuffer->format.speed;
+ R_TimeReport("audiomix");
}
/*
*/
void S_Update(const matrix4x4_t *listenermatrix)
{
- unsigned int i, j, total;
+ unsigned int i, j, k;
channel_t *ch, *combine;
- matrix4x4_t basematrix, rotatematrix;
+ matrix4x4_t rotatematrix;
if (snd_renderbuffer == NULL || nosound.integer)
return;
- if (snd_blocked > 0 && !(cls.capturevideo.soundrate && !cls.capturevideo.realtime))
- return;
+ {
+ double mindist_trans, maxdist_trans;
+
+ spatialmin = snd_spatialization_min.value;
+ spatialdiff = snd_spatialization_max.value - spatialmin;
+
+ if(snd_spatialization_control.value)
+ {
+ spatialpower = snd_spatialization_power.value;
+
+ if(spatialpower == 0)
+ {
+ spatialmethod = SPATIAL_LOG;
+ mindist_trans = log(max(1, snd_spatialization_min_radius.value));
+ maxdist_trans = log(max(1, snd_spatialization_max_radius.value));
+ }
+ else
+ {
+ spatialmethod = SPATIAL_POW;
+ mindist_trans = pow(snd_spatialization_min_radius.value, spatialpower);
+ maxdist_trans = pow(snd_spatialization_max_radius.value, spatialpower);
+ }
+
+ if(mindist_trans - maxdist_trans == 0)
+ {
+ spatialmethod = SPATIAL_THRESH;
+ mindist_trans = snd_spatialization_min_radius.value;
+ }
+ else
+ {
+ spatialoffset = mindist_trans;
+ spatialfactor = 1 / (maxdist_trans - mindist_trans);
+ }
+ }
+ else
+ spatialmethod = SPATIAL_NONE;
+
+ }
// If snd_swapstereo or snd_channellayout has changed, recompute the channel layout
- if (current_swapstereo != snd_swapstereo.integer ||
+ if (current_swapstereo != boolxor(snd_swapstereo.integer, v_flipped.integer) ||
current_channellayout != snd_channellayout.integer)
S_SetChannelLayout();
- Matrix4x4_Invert_Simple(&basematrix, listenermatrix);
+ Matrix4x4_Invert_Simple(&listener_basematrix, listenermatrix);
Matrix4x4_OriginFromMatrix(listenermatrix, listener_origin);
+ if (cl.worldmodel && cl.worldmodel->brush.FatPVS && cl.worldmodel->brush.num_pvsclusterbytes && cl.worldmodel->brush.PointInLeaf)
+ {
+ if(cl.worldmodel->brush.num_pvsclusterbytes != listener_pvsbytes)
+ {
+ if(listener_pvs)
+ Mem_Free(listener_pvs);
+ listener_pvsbytes = cl.worldmodel->brush.num_pvsclusterbytes;
+ listener_pvs = (unsigned char *) Mem_Alloc(snd_mempool, listener_pvsbytes);
+ }
+ cl.worldmodel->brush.FatPVS(cl.worldmodel, listener_origin, 2, listener_pvs, listener_pvsbytes, 0);
+ }
+ else
+ {
+ if(listener_pvs)
+ {
+ Mem_Free(listener_pvs);
+ listener_pvs = NULL;
+ }
+ listener_pvsbytes = 0;
+ }
// calculate the current matrices
for (j = 0;j < SND_LISTENERS;j++)
{
Matrix4x4_CreateFromQuakeEntity(&rotatematrix, 0, 0, 0, 0, -snd_speakerlayout.listeners[j].yawangle, 0, 1);
- Matrix4x4_Concat(&listener_matrix[j], &rotatematrix, &basematrix);
+ Matrix4x4_Concat(&listener_matrix[j], &rotatematrix, &listener_basematrix);
// I think this should now do this:
// 1. create a rotation matrix for rotating by e.g. -90 degrees CCW
// (note: the matrix will rotate the OBJECT, not the VIEWER, so its
S_UpdateAmbientSounds ();
combine = NULL;
+ R_TimeReport("audioprep");
// update spatialization for static and dynamic sounds
+ cls.soundstats.totalsounds = 0;
+ cls.soundstats.mixedsounds = 0;
ch = channels+NUM_AMBIENTS;
for (i=NUM_AMBIENTS ; i<total_channels; i++, ch++)
{
if (!ch->sfx)
continue;
+ cls.soundstats.totalsounds++;
// respatialize channel
SND_Spatialize(ch, i >= MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS);
{
for (j = 0;j < SND_LISTENERS;j++)
{
- combine->listener_volume[j] += ch->listener_volume[j];
+ combine->listener_volume[j] = bound(0, combine->listener_volume[j] + ch->listener_volume[j], 65536);
ch->listener_volume[j] = 0;
}
}
}
+ for (k = 0;k < SND_LISTENERS;k++)
+ if (ch->listener_volume[k])
+ break;
+ if (k < SND_LISTENERS)
+ cls.soundstats.mixedsounds++;
}
+ R_TimeReport("audiospatialize");
sound_spatialized = true;
// debugging output
if (snd_show.integer)
- {
- total = 0;
- ch = channels;
- for (i=0 ; i<total_channels; i++, ch++)
- {
- if (ch->sfx)
- {
- for (j = 0;j < SND_LISTENERS;j++)
- if (ch->listener_volume[j])
- break;
- if (j < SND_LISTENERS)
- total++;
- }
- }
-
- Con_Printf("----(%u)----\n", total);
- }
+ Con_Printf("----(%u)----\n", cls.soundstats.mixedsounds);
S_PaintAndSubmit();
}
return false;
}
- // Local sounds must not be freed
- sfx->flags |= SFXFLAG_PERMANENTLOCK;
+ // menu sounds must not be freed on level change
+ sfx->flags |= SFXFLAG_MENUSOUND;
+ // fun fact: in Quake 1, this used -1 "replace any entity channel",
+ // which we no longer support anyway
+ // changed by Black in r4297 "Changed S_LocalSound to play multiple sounds at a time."
ch_ind = S_StartSound (cl.viewentity, 0, sfx, vec3_origin, 1, 0);
if (ch_ind < 0)
return false;
projects / xonotic / darkplaces.git / blobdiff