diff --git a/libs/audio/renderer/snd_dma.c b/libs/audio/renderer/snd_dma.c index 6753f9455..39903916f 100644 --- a/libs/audio/renderer/snd_dma.c +++ b/libs/audio/renderer/snd_dma.c @@ -55,12 +55,6 @@ static __attribute__ ((used)) const char rcsid[] = #include "snd_render.h" -unsigned int snd_paintedtime; // sample PAIRS - -cvar_t *snd_loadas8bit; -cvar_t *snd_volume; -cvar_t *snd_interp; - static qboolean snd_initialized = false; static int snd_blocked = 0; @@ -382,8 +376,6 @@ s_init (void) Cmd_AddCommand ("snd_force_unblock", s_snd_force_unblock, "fix permanently blocked sound"); - snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, NULL, - "control sample interpolation"); nosound = Cvar_Get ("nosound", "0", CVAR_NONE, NULL, "Set to turn sound off"); snd_volume = Cvar_Get ("volume", "0.7", CVAR_ARCHIVE, NULL, diff --git a/libs/audio/renderer/snd_jack.c b/libs/audio/renderer/snd_jack.c index d2b5852af..c4d1b4c94 100644 --- a/libs/audio/renderer/snd_jack.c +++ b/libs/audio/renderer/snd_jack.c @@ -154,8 +154,6 @@ s_init (void) Cmd_AddCommand ("snd_force_unblock", s_snd_force_unblock, "fix permanently blocked sound"); - snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, NULL, - "control sample interpolation"); snd_volume = Cvar_Get ("volume", "0.7", CVAR_ARCHIVE, NULL, "Set the volume for sound playback"); snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, NULL, diff --git a/libs/audio/renderer/snd_mix.c b/libs/audio/renderer/snd_mix.c index 3c193c88b..3121ee2b1 100644 --- a/libs/audio/renderer/snd_mix.c +++ b/libs/audio/renderer/snd_mix.c @@ -47,6 +47,10 @@ static __attribute__ ((used)) const char rcsid[] = #include "compat.h" #include "snd_render.h" +cvar_t *snd_volume; + +unsigned int snd_paintedtime; // sample PAIRS + portable_samplepair_t snd_paintbuffer[PAINTBUFFER_SIZE * 2]; static int max_overpaint; // number of extra samples painted // due to phase shift diff --git a/libs/audio/renderer/snd_resample.c b/libs/audio/renderer/snd_resample.c index 4def8343d..8eee899af 100644 --- a/libs/audio/renderer/snd_resample.c +++ b/libs/audio/renderer/snd_resample.c @@ -58,6 +58,9 @@ typedef struct { short right; } stereo16_t; +cvar_t *snd_loadas8bit; +cvar_t *snd_interp; + void SND_ResampleMono (sfxbuffer_t *sc, byte *data, int length, void *prev) {