X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_null.c;h=f290ed152546b99be1f01caf19ff91059d159479;hp=d63f307d5813f355119736d2c1ac48cfb989171f;hb=b5f2509c170bf13f83cdb0e5d25f9cfc7469e986;hpb=071f4b01d2665d6f77635425a2212b423d02a4b6

diff --git a/snd_null.c b/snd_null.c
index d63f307d..f290ed15 100755
--- a/snd_null.c
+++ b/snd_null.c
@@ -22,29 +22,32 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #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"};
-
-cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0"};
+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);
 	Cvar_RegisterVariable(&snd_initialized);
+	Cvar_RegisterVariable(&snd_mutewhenidle);
 }
 
-void S_Startup (void)
+void S_Terminate (void)
 {
 }
 
-void S_Shutdown (void)
+void S_Startup (void)
 {
 }
 
-void S_TouchSound (const char *sample, qboolean stdpath)
+void S_Shutdown (void)
 {
 }
 
@@ -56,58 +59,71 @@ 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)
 {
 }
 
-int 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;
 }
 
-void S_StopChannel (unsigned int channel_ind)
+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_PauseChannel (unsigned int channel_ind, qboolean toggle)
+void S_StopChannel (unsigned int channel_ind, qbool lockmutex, qbool freesfx)
 {
 }
 
-void S_LoopChannel (unsigned int channel_ind, qboolean toggle)
+qbool S_SetChannelFlag (unsigned int ch_ind, unsigned int flag, qbool value)
 {
+	return false;
 }
 
 void S_StopSound (int entnum, int entchannel)
 {
 }
 
-void S_PauseGameSounds (void)
+void S_PauseGameSounds (qbool toggle)
 {
 }
 
-void S_ResumeGameSounds (void)
+void S_SetChannelVolume (unsigned int ch_ind, float fvol)
 {
 }
 
-void S_SetChannelVolume (unsigned int ch_ind, float fvol)
+sfx_t *S_PrecacheSound (const char *sample, qbool complain, qbool levelsound)
 {
+	return NULL;
 }
 
-sfx_t *S_GetCached(const char *name, qboolean stdpath)
+float S_SoundLength(const char *name)
 {
-	return NULL;
+	return -1;
+}
+
+qbool S_IsSoundPrecached (const sfx_t *sfx)
+{
+	return false;
 }
 
-sfx_t *S_PrecacheSound (const char *sample, qboolean complain, qboolean stdpath)
+void S_UnloadAllSounds_f (cmd_state_t *cmd)
+{
+}
+
+sfx_t *S_FindName (const char *name)
 {
 	return NULL;
 }
 
-void S_Update(vec3_t origin, vec3_t forward, vec3_t left, vec3_t up)
+void S_Update(const matrix4x4_t *matrix)
 {
 }
 
-void S_StopAllSounds (qboolean clear)
+void S_StopAllSounds (void)
 {
 }
 
@@ -115,6 +131,44 @@ void S_ExtraUpdate (void)
 {
 }
 
-void S_LocalSound (const char *s, qboolean stdpath)
+qbool S_LocalSound (const char *s)
+{
+	return false;
+}
+
+qbool S_LocalSoundEx (const char *s, int chan, float fvol)
+{
+	return false;
+}
+
+void S_BlockSound (void)
+{
+}
+
+void S_UnblockSound (void)
+{
+}
+
+int S_GetSoundRate(void)
+{
+	return 0;
+}
+
+int S_GetSoundChannels(void)
+{
+	return 0;
+}
+
+float S_GetChannelPosition (unsigned int ch_ind)
+{
+	return -1;
+}
+
+float S_GetEntChannelPosition(int entnum, int entchannel)
+{
+	return -1;
+}
+
+void SndSys_SendKeyEvents(void)
 {
 }