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

diff --git a/snd_null.c b/snd_null.c
index d1e58d03..f290ed15 100755
--- a/snd_null.c
+++ b/snd_null.c
@@ -1,274 +1,174 @@
 /*
-
 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 = {CF_ARCHIVE, "bgmvolume", "1", "volume of background music (such as CD music or replacement files such as sound/cdtracks/track002.ogg)"};
+cvar_t mastervolume = {CF_ARCHIVE, "mastervolume", "1", "master volume"};
+cvar_t volume = {CF_ARCHIVE, "volume", "0.7", "volume of sound effects"};
+cvar_t snd_staticvolume = {CF_ARCHIVE, "snd_staticvolume", "1", "volume of ambient sound effects (such as swampy sounds at the start of e1m2)"};
+cvar_t snd_initialized = { CF_READONLY, "snd_initialized", "0", "indicates the sound subsystem is active"};
+cvar_t snd_mutewhenidle = {CF_ARCHIVE, "snd_mutewhenidle", "1", "whether to disable sound output when game window is inactive"};
 
 void S_Init (void)
-
 {
-
 	Cvar_RegisterVariable(&bgmvolume);
-
+	Cvar_RegisterVariable(&mastervolume);
 	Cvar_RegisterVariable(&volume);
-
 	Cvar_RegisterVariable(&snd_staticvolume);
-
-}
-
-
-
-void S_AmbientOff (void)
-
-{
-
+	Cvar_RegisterVariable(&snd_initialized);
+	Cvar_RegisterVariable(&snd_mutewhenidle);
 }
 
-
-
-void S_AmbientOn (void)
-
+void S_Terminate (void)
 {
-
 }
 
-
-
 void S_Startup (void)
-
 {
-
 }
 
-
-
 void S_Shutdown (void)
-
 {
-
 }
 
-
-
-void S_TouchSound (char *sample)
-
+void S_ClearUsed (void)
 {
-
 }
 
-
-
-void S_ClearBuffer (void)
-
+void S_PurgeUnused (void)
 {
-
 }
 
 
-
-void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
-
+void S_StaticSound (sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
 {
-
 }
 
-
-
-void S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol,  float attenuation)
-
+int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
 {
+	return -1;
+}
 
+int S_StartSound_StartPosition_Flags (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation, float startposition, int flags, float fspeed)
+{
+	return -1;
 }
 
+void S_StopChannel (unsigned int channel_ind, qbool lockmutex, qbool freesfx)
+{
+}
 
+qbool S_SetChannelFlag (unsigned int ch_ind, unsigned int flag, qbool value)
+{
+	return false;
+}
 
 void S_StopSound (int entnum, int entchannel)
-
 {
-
 }
 
-
-
-sfx_t *S_GetCached(const char *name)
-
+void S_PauseGameSounds (qbool toggle)
 {
-
-	return NULL;
-
 }
 
-
-
-sfx_t *S_PrecacheSound (char *sample, int complain)
-
+void S_SetChannelVolume (unsigned int ch_ind, float fvol)
 {
+}
 
+sfx_t *S_PrecacheSound (const char *sample, qbool complain, qbool levelsound)
+{
 	return NULL;
-
 }
 
-
-
-void S_ClearPrecache (void)
-
+float S_SoundLength(const char *name)
 {
-
+	return -1;
 }
 
-
-
-void S_Update (vec3_t origin, vec3_t v_forward, vec3_t v_right, vec3_t v_up)
-
+qbool S_IsSoundPrecached (const sfx_t *sfx)
 {
-
+	return false;
 }
 
-
-
-void S_StopAllSounds (qboolean clear)
-
+void S_UnloadAllSounds_f (cmd_state_t *cmd)
 {
-
 }
 
-
-
-void S_BeginPrecaching (void)
-
+sfx_t *S_FindName (const char *name)
 {
-
+	return NULL;
 }
 
-
-
-void S_EndPrecaching (void)
-
+void S_Update(const matrix4x4_t *matrix)
 {
-
 }
 
-
+void S_StopAllSounds (void)
+{
+}
 
 void S_ExtraUpdate (void)
-
 {
-
 }
 
-
-
-void S_LocalSound (char *s)
-
+qbool S_LocalSound (const char *s)
 {
-
+	return false;
 }
 
-
-
-void S_RawSamples_Enqueue(short *samples, unsigned int length)
-
+qbool S_LocalSoundEx (const char *s, int chan, float fvol)
 {
-
+	return false;
 }
 
-
-
-void S_RawSamples_Dequeue(int *samples, unsigned int length)
-
+void S_BlockSound (void)
 {
-
 }
 
-
-
-void S_RawSamples_ClearQueue(void)
-
+void S_UnblockSound (void)
 {
-
 }
 
-
-
-int S_RawSamples_QueueWantsMore(void)
-
+int S_GetSoundRate(void)
 {
-
 	return 0;
-
 }
 
-
-
-void S_ResampleBuffer16Stereo(short *input, int inputlength, short *output, int outputlength)
-
+int S_GetSoundChannels(void)
 {
-
+	return 0;
 }
 
-
-
-int S_RawSamples_SampleRate(void)
-
+float S_GetChannelPosition (unsigned int ch_ind)
 {
-
-	return 0;
-
+	return -1;
 }
 
+float S_GetEntChannelPosition(int entnum, int entchannel)
+{
+	return -1;
+}
 
-
+void SndSys_SendKeyEvents(void)
+{
+}