X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_null.c;h=bc71a4f30835082a6164a480c8c333bcccdd7817;hp=b8627b9218961bf6aea6712f179f9d839fedec0b;hb=32510c922fbcaad22056befd2018ea9066c1f138;hpb=e61e64e24dc955e55dee4b26ffa4ea1e6fbe7701

diff --git a/snd_null.c b/snd_null.c
index b8627b92..bc71a4f3 100755
--- a/snd_null.c
+++ b/snd_null.c
@@ -22,83 +22,108 @@ 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 = {CVAR_SAVE, "bgmvolume", "1", "volume of background music (such as CD music or replacement files such as sound/cdtracks/track002.ogg)"};
+cvar_t mastervolume = {CVAR_SAVE, "mastervolume", "1", "master volume"};
+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_initialized = { CVAR_READONLY, "snd_initialized", "0", "indicates the sound subsystem is active"};
+cvar_t snd_mutewhenidle = {CVAR_SAVE, "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_AmbientOff (void)
+void S_Terminate (void)
 {
 }
 
-void S_AmbientOn (void)
+void S_Startup (void)
 {
 }
 
-void S_Startup (void)
+void S_Shutdown (void)
 {
 }
 
-void S_Shutdown (void)
+void S_ClearUsed (void)
+{
+}
+
+void S_PurgeUnused (void)
+{
+}
+
+
+void S_StaticSound (sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
 {
 }
 
-void S_TouchSound (char *sample)
+int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
 {
+	return -1;
 }
 
-void S_ClearBuffer (void)
+int S_StartSound_StartPosition (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation, float startposition)
 {
+	return -1;
 }
 
-void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
+void S_StopChannel (unsigned int channel_ind, qboolean lockmutex)
 {
 }
 
-void S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol,  float attenuation)
+qboolean S_SetChannelFlag (unsigned int ch_ind, unsigned int flag, qboolean value)
 {
+	return false;
 }
 
 void S_StopSound (int entnum, int entchannel)
 {
 }
 
-sfx_t *S_GetCached(const char *name)
+void S_PauseGameSounds (qboolean toggle)
+{
+}
+
+void S_SetChannelVolume (unsigned int ch_ind, float fvol)
 {
-	return NULL;
 }
 
-sfx_t *S_PrecacheSound (char *sample, int complain)
+sfx_t *S_PrecacheSound (const char *sample, qboolean complain, qboolean serversound)
 {
 	return NULL;
 }
 
-void S_ClearPrecache (void)
+float S_SoundLength(const char *name)
+{
+	return -1;
+}
+
+qboolean S_IsSoundPrecached (const sfx_t *sfx)
 {
+	return false;
 }
 
-void S_Update(vec3_t origin, vec3_t forward, vec3_t left, vec3_t up)
+void S_UnloadAllSounds_f (void)
 {
 }
 
-void S_StopAllSounds (qboolean clear)
+sfx_t *S_FindName (const char *name)
 {
+	return NULL;
 }
 
-void S_BeginPrecaching (void)
+void S_Update(const matrix4x4_t *matrix)
 {
 }
 
-void S_EndPrecaching (void)
+void S_StopAllSounds (void)
 {
 }
 
@@ -106,33 +131,39 @@ void S_ExtraUpdate (void)
 {
 }
 
-void S_LocalSound (char *s)
+qboolean S_LocalSound (const char *s)
 {
+	return false;
 }
 
-void S_RawSamples_Enqueue(short *samples, unsigned int length)
+void S_BlockSound (void)
 {
 }
 
-void S_RawSamples_Dequeue(int *samples, unsigned int length)
+void S_UnblockSound (void)
 {
 }
 
-void S_RawSamples_ClearQueue(void)
+int S_GetSoundRate(void)
 {
+	return 0;
 }
 
-int S_RawSamples_QueueWantsMore(void)
+int S_GetSoundChannels(void)
 {
 	return 0;
 }
 
-void S_ResampleBuffer16Stereo(short *input, int inputlength, short *output, int outputlength)
+float S_GetChannelPosition (unsigned int ch_ind)
 {
+	return -1;
 }
 
-int S_RawSamples_SampleRate(void)
+float S_GetEntChannelPosition(int entnum, int entchannel)
 {
-	return 0;
+	return -1;
 }
 
+void SndSys_SendKeyEvents(void)
+{
+}