From cddaa521cc05e0e14d6968d0843020a401fefb96 Mon Sep 17 00:00:00 2001 From: Ragnvald Maartmann-Moe IV Date: Wed, 15 Aug 2001 00:53:37 +0000 Subject: [PATCH] Change loadas8bit to snd_loadas8bit. --- include/QF/sound.h | 2 +- libs/audio/targets/snd_dma.c | 56 +++++++++++++++++------------------ libs/audio/targets/snd_mem.c | 4 +-- libs/audio/targets/snd_null.c | 16 +++++----- 4 files changed, 39 insertions(+), 39 deletions(-) diff --git a/include/QF/sound.h b/include/QF/sound.h index c9ce222be..6840d2f64 100644 --- a/include/QF/sound.h +++ b/include/QF/sound.h @@ -196,7 +196,7 @@ extern volatile dma_t *shm; extern volatile dma_t sn; extern vec_t sound_nominal_clip_dist; -extern struct cvar_s *loadas8bit; +extern struct cvar_s *snd_loadas8bit; extern struct cvar_s *bgmvolume; extern struct cvar_s *volume; diff --git a/libs/audio/targets/snd_dma.c b/libs/audio/targets/snd_dma.c index cbf691c84..c1de9ca68 100644 --- a/libs/audio/targets/snd_dma.c +++ b/libs/audio/targets/snd_dma.c @@ -102,7 +102,7 @@ int desired_bits = 16; int sound_started = 0; -extern cvar_t *loadas8bit; +extern cvar_t *snd_loadas8bit; extern cvar_t *snd_interp; extern cvar_t *bgmvolume; extern cvar_t *volume; @@ -220,7 +220,7 @@ SND_Init (void) // FIXME // if (host_parms.memsize < 0x800000) { -// Cvar_Set (loadas8bit, "1"); +// Cvar_Set (snd_loadas8bit, "1"); // Con_Printf ("loading all sounds as 8bit\n"); // } @@ -269,43 +269,43 @@ SND_Init (void) void SND_Init_Cvars (void) { - snd_device = Cvar_Get ("snd_device", "", CVAR_ROM, NULL, - "sound device. \"\" is system default"); - snd_rate = Cvar_Get ("snd_rate", "0", CVAR_ROM, NULL, - "sound playback rate. 0 is system default"); - snd_bits = Cvar_Get ("snd_bits", "0", CVAR_ROM, NULL, - "sound sample depth. 0 is system default"); - snd_stereo = Cvar_Get ("snd_stereo", "1", CVAR_ROM, NULL, - "sound stereo output"); - nosound = Cvar_Get ("nosound", "0", CVAR_NONE, NULL, - "Set to turn sound off"); - volume = Cvar_Get ("volume", "0.7", CVAR_ARCHIVE, NULL, - "Set the volume for sound playback"); - precache = Cvar_Get ("precache", "1", CVAR_NONE, NULL, - "Toggle the use of a precache"); - loadas8bit = Cvar_Get ("loadas8bit", "0", CVAR_NONE, NULL, - "Toggles if sounds are loaded as 8-bit samples"); - bgmvolume = Cvar_Get ("bgmvolume", "1", CVAR_ARCHIVE, NULL, - "Volume of CD music"); - ambient_level = Cvar_Get ("ambient_level", "0.3", CVAR_NONE, NULL, - "Ambient sounds' volume"); ambient_fade = Cvar_Get ("ambient_fade", "100", CVAR_NONE, NULL, "How quickly ambient sounds fade in or out"); + ambient_level = Cvar_Get ("ambient_level", "0.3", CVAR_NONE, NULL, + "Ambient sounds' volume"); + nosound = Cvar_Get ("nosound", "0", CVAR_NONE, NULL, + "Set to turn sound off"); + precache = Cvar_Get ("precache", "1", CVAR_NONE, NULL, + "Toggle the use of a precache"); + bgmvolume = Cvar_Get ("bgmvolume", "1", CVAR_ARCHIVE, NULL, + "Volume of CD music"); + volume = Cvar_Get ("volume", "0.7", CVAR_ARCHIVE, NULL, + "Set the volume for sound playback"); + snd_bits = Cvar_Get ("snd_bits", "0", CVAR_ROM, NULL, + "sound sample depth. 0 is system default"); + snd_device = Cvar_Get ("snd_device", "", CVAR_ROM, NULL, + "sound device. \"\" is system default"); + snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, NULL, + "control sample interpolation"); + snd_loadas8bit = Cvar_Get ("snd_loadas8bit", "0", CVAR_NONE, NULL, + "Toggles loading sounds as 8-bit samples"); + snd_mixahead = Cvar_Get ("snd_mixahead", "0.1", CVAR_ARCHIVE, NULL, + "Delay time for sounds"); snd_noextraupdate = Cvar_Get ("snd_noextraupdate", "0", CVAR_NONE, NULL, "Toggles the correct value display in " "host_speeds. Usually messes up sound " "playback when in effect"); - snd_show = Cvar_Get ("snd_show", "0", CVAR_NONE, NULL, - "Toggles display of sounds currently being played"); - snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, NULL, - "control sample interpolation"); snd_phasesep = Cvar_Get ("snd_phasesep", "0.0", CVAR_ARCHIVE, NULL, "max stereo phase separation in ms. 0.6 is for " "20cm head"); + snd_rate = Cvar_Get ("snd_rate", "0", CVAR_ROM, NULL, + "sound playback rate. 0 is system default"); + snd_show = Cvar_Get ("snd_show", "0", CVAR_NONE, NULL, + "Toggles display of sounds currently being played"); + snd_stereo = Cvar_Get ("snd_stereo", "1", CVAR_ROM, NULL, + "sound stereo output"); snd_volumesep = Cvar_Get ("snd_volumesep", "1.0", CVAR_ARCHIVE, NULL, "max stereo volume separation. 1.0 is max"); - snd_mixahead = Cvar_Get ("snd_mixahead", "0.1", CVAR_ARCHIVE, NULL, - "Delay time for sounds"); } diff --git a/libs/audio/targets/snd_mem.c b/libs/audio/targets/snd_mem.c index 2be023b05..3c050ba3a 100644 --- a/libs/audio/targets/snd_mem.c +++ b/libs/audio/targets/snd_mem.c @@ -79,7 +79,7 @@ SND_ResampleSfx (sfx_t *sfx, int inrate, int inwidth, byte * data) outcount = sc->length / stepscale; sc->speed = shm->speed; - if (loadas8bit->int_val) + if (snd_loadas8bit->int_val) sc->width = 1; else sc->width = 2; @@ -206,7 +206,7 @@ SND_LoadSound (sfx_t *s) stepscale = (float) info.rate / shm->speed; len = info.samples / stepscale; - if (loadas8bit->int_val) { + if (snd_loadas8bit->int_val) { len = len * info.channels; } else { len = len * 2 * info.channels; diff --git a/libs/audio/targets/snd_null.c b/libs/audio/targets/snd_null.c index 14b4943c3..66765fff4 100644 --- a/libs/audio/targets/snd_null.c +++ b/libs/audio/targets/snd_null.c @@ -40,7 +40,7 @@ extern channel_t channels[MAX_CHANNELS]; extern int total_channels; extern volatile dma_t *shm; -extern cvar_t *loadas8bit; +extern cvar_t *snd_loadas8bit; extern int paintedtime; // sample PAIRS extern qboolean snd_initialized; @@ -67,14 +67,14 @@ SND_Init (void) void SND_Init_Cvars (void) { - volume = Cvar_Get ("volume", "0.7", CVAR_ARCHIVE, NULL, - "Volume level of sounds"); - loadas8bit = - Cvar_Get ("loadas8bit", "0", CVAR_NONE, NULL, "Load samples as 8-bit"); bgmvolume = Cvar_Get ("bgmvolume", "1", CVAR_ARCHIVE, NULL, - "CD music volume"); - snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, NULL, - "control sample interpolation"); + "CD music volume"); + volume = Cvar_Get ("volume", "0.7", CVAR_ARCHIVE, NULL, + "Volume level of sounds"); + snd_loadas8bit = Cvar_Get ("snd_loadas8bit", "0", CVAR_NONE, NULL, + "Toggles loading sounds as 8-bit samples"); + snd_interp = Cvar_Get ("snd_interp", "1", CVAR_ARCHIVE, NULL, + "control sample interpolation"); } void