qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-29 20:20:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

clean up snd.c a little

Browse source
This commit is contained in:
Bill Currie 2004-01-08 00:25:52 +00:00
parent 16f0a54a84
commit e639e5efc3
2 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/audio/renderer/snd_dma.c
View file

@ -55,6 +55,14 @@ static __attribute__ ((unused)) const char rcsid[] =
// Internal sound data & structures =========================================== // Internal sound data & structures ===========================================
volatile dma_t *shm = 0;
unsigned int paintedtime; // sample PAIRS
qboolean snd_initialized = false;
cvar_t *snd_loadas8bit;
cvar_t *volume;
cvar_t *snd_interp;
channel_t channels[MAX_CHANNELS]; channel_t channels[MAX_CHANNELS];
int total_channels; int total_channels;
@ -851,6 +859,8 @@ SND_UnblockSound (void)
static void static void
SND_Init_Cvars (void) SND_Init_Cvars (void)
{ {
snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, NULL,
"control sample interpolation");
ambient_fade = Cvar_Get ("ambient_fade", "100", CVAR_NONE, NULL, ambient_fade = Cvar_Get ("ambient_fade", "100", CVAR_NONE, NULL,
"How quickly ambient sounds fade in or out"); "How quickly ambient sounds fade in or out");
ambient_level = Cvar_Get ("ambient_level", "0.3", CVAR_NONE, NULL, ambient_level = Cvar_Get ("ambient_level", "0.3", CVAR_NONE, NULL,

18
libs/audio/snd.c
View file

@ -39,18 +39,6 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/plugin.h" #include "QF/plugin.h"
#include "QF/sys.h" #include "QF/sys.h"
// =======================================================================
// Various variables also defined in snd_dma.c
// FIXME - should be put in one place
// =======================================================================
volatile dma_t *shm = 0;
unsigned int paintedtime; // sample PAIRS
qboolean snd_initialized = false;
cvar_t *snd_loadas8bit;
cvar_t *volume;
cvar_t *snd_interp;
static cvar_t *snd_output; static cvar_t *snd_output;
static cvar_t *snd_render; static cvar_t *snd_render;
static plugin_t *snd_render_module = NULL; static plugin_t *snd_render_module = NULL;
@ -112,12 +100,6 @@ S_Init (struct model_s **worldmodel, int *viewentity, double *host_frametime)
void void
S_Init_Cvars (void) S_Init_Cvars (void)
{ {
volume = Cvar_Get ("volume", "0.7", CVAR_ARCHIVE, NULL,
"Volume level of sounds");
snd_loadas8bit = Cvar_Get ("snd_loadas8bit", "0", CVAR_NONE, NULL,
"Load samples as 8-bit");
snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, NULL,
"control sample interpolation");
#ifdef _WIN32 #ifdef _WIN32
snd_output = Cvar_Get ("snd_output", "dx", CVAR_ROM, NULL, snd_output = Cvar_Get ("snd_output", "dx", CVAR_ROM, NULL,
"Sound Output Plugin to use"); "Sound Output Plugin to use");