X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_null.c;h=3da10596c4638b1eb896c0e084cf2e9b2e66db36;hb=75afd36f8da83a849f09c36e48e8cd733ad14a8d;hp=d1e58d03de6aa72140444415be4e0132d552b831;hpb=7bfa40af559277b011eae026e848c62357cf127d;p=xonotic%2Fdarkplaces.git

diff --git a/snd_null.c b/snd_null.c
index d1e58d03..3da10596 100755
--- a/snd_null.c
+++ b/snd_null.c
@@ -1,274 +1,118 @@
 /*
-
 Copyright (C) 1996-1997 Id Software, Inc.
 
-
-
 This program is free software; you can redistribute it and/or
-
 modify it under the terms of the GNU General Public License
-
 as published by the Free Software Foundation; either version 2
-
 of the License, or (at your option) any later version.
 
-
-
 This program is distributed in the hope that it will be useful,
-
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-
-
 See the GNU General Public License for more details.
 
-
-
 You should have received a copy of the GNU General Public License
-
 along with this program; if not, write to the Free Software
-
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-
-
 */
-
 // snd_null.c -- include this instead of all the other snd_* files to have
-
 // no sound code whatsoever
 
-
-
 #include "quakedef.h"
 
-
-
-cvar_t bgmvolume = {CVAR_SAVE, "bgmvolume", "1"};
-
-cvar_t volume = {CVAR_SAVE, "volume", "0.7"};
-
-cvar_t snd_staticvolume = {CVAR_SAVE, "snd_staticvolume", "1"};
-
-
-
-qboolean snd_initialized = false;
-
-
+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 volume = {CVAR_SAVE, "volume", "0.7", "volume of sound effects"};
+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_mixahead = {CVAR_SAVE, "_snd_mixahead", "0.1", "how much sound to mix ahead of time"};
+cvar_t snd_swapstereo = {CVAR_SAVE, "snd_swapstereo", "0", "swaps left/right speakers for old ISA soundblaster cards"};
+cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0", "indicates the sound subsystem is active"};
 
 void S_Init (void)
-
 {
-
 	Cvar_RegisterVariable(&bgmvolume);
-
 	Cvar_RegisterVariable(&volume);
-
 	Cvar_RegisterVariable(&snd_staticvolume);
-
+	Cvar_RegisterVariable(&_snd_mixahead);
+	Cvar_RegisterVariable(&snd_swapstereo);
+	Cvar_RegisterVariable(&snd_initialized);
 }
 
-
-
-void S_AmbientOff (void)
-
+void S_Terminate (void)
 {
-
 }
 
-
-
-void S_AmbientOn (void)
-
-{
-
-}
-
-
-
 void S_Startup (void)
-
 {
-
 }
 
-
-
 void S_Shutdown (void)
-
 {
-
 }
 
-
-
-void S_TouchSound (char *sample)
-
+void S_ServerSounds (char serversound [][MAX_QPATH], unsigned int numsounds)
 {
-
 }
 
-
-
-void S_ClearBuffer (void)
-
+void S_StaticSound (sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
 {
-
 }
 
-
-
-void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
-
+int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
 {
-
+	return -1;
 }
 
-
-
-void S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol,  float attenuation)
-
+void S_StopChannel (unsigned int channel_ind)
 {
-
 }
 
-
-
-void S_StopSound (int entnum, int entchannel)
-
+qboolean S_SetChannelFlag (unsigned int ch_ind, unsigned int flag, qboolean value)
 {
-
+	return false;
 }
 
-
-
-sfx_t *S_GetCached(const char *name)
-
-{
-
-	return NULL;
-
-}
-
-
-
-sfx_t *S_PrecacheSound (char *sample, int complain)
-
-{
-
-	return NULL;
-
-}
-
-
-
-void S_ClearPrecache (void)
-
-{
-
-}
-
-
-
-void S_Update (vec3_t origin, vec3_t v_forward, vec3_t v_right, vec3_t v_up)
-
-{
-
-}
-
-
-
-void S_StopAllSounds (qboolean clear)
-
-{
-
-}
-
-
-
-void S_BeginPrecaching (void)
-
+void S_StopSound (int entnum, int entchannel)
 {
-
 }
 
-
-
-void S_EndPrecaching (void)
-
+void S_PauseGameSounds (qboolean toggle)
 {
-
 }
 
-
-
-void S_ExtraUpdate (void)
-
+void S_SetChannelVolume (unsigned int ch_ind, float fvol)
 {
-
 }
 
-
-
-void S_LocalSound (char *s)
-
+sfx_t *S_PrecacheSound (const char *sample, qboolean complain, qboolean lock)
 {
-
+	return NULL;
 }
 
-
-
-void S_RawSamples_Enqueue(short *samples, unsigned int length)
-
+qboolean S_IsSoundPrecached (const sfx_t *sfx)
 {
-
+	return false;
 }
 
-
-
-void S_RawSamples_Dequeue(int *samples, unsigned int length)
-
+sfx_t *S_FindName (const char *name)
 {
-
+	return NULL;
 }
 
-
-
-void S_RawSamples_ClearQueue(void)
-
+void S_Update(const matrix4x4_t *matrix)
 {
-
 }
 
-
-
-int S_RawSamples_QueueWantsMore(void)
-
+void S_StopAllSounds (void)
 {
-
-	return 0;
-
 }
 
-
-
-void S_ResampleBuffer16Stereo(short *input, int inputlength, short *output, int outputlength)
-
+void S_ExtraUpdate (void)
 {
-
 }
 
-
-
-int S_RawSamples_SampleRate(void)
-
+qboolean S_LocalSound (const char *s)
 {
-
-	return 0;
-
+	return false;
 }
-
-
-