X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=snd_null.c;h=bc71a4f30835082a6164a480c8c333bcccdd7817;hp=c98440ac23f3b34a68ec60284cb21a0f3125bb87;hb=1fa82ae49ae155e5258c0675fb619922281d6439;hpb=84661191e0819cf88c208b4ad314fcd23e8e1fbd

diff --git a/snd_null.c b/snd_null.c
index c98440ac..bc71a4f3 100755
--- a/snd_null.c
+++ b/snd_null.c
@@ -23,16 +23,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 
 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_Terminate (void)
@@ -47,10 +51,15 @@ void S_Shutdown (void)
 {
 }
 
-void S_ServerSounds (char serversound [][MAX_QPATH], unsigned int numsounds)
+void S_ClearUsed (void)
 {
 }
 
+void S_PurgeUnused (void)
+{
+}
+
+
 void S_StaticSound (sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
 {
 }
@@ -60,7 +69,12 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
 	return -1;
 }
 
-void S_StopChannel (unsigned int channel_ind)
+int S_StartSound_StartPosition (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation, float startposition)
+{
+	return -1;
+}
+
+void S_StopChannel (unsigned int channel_ind, qboolean lockmutex)
 {
 }
 
@@ -81,16 +95,25 @@ void S_SetChannelVolume (unsigned int ch_ind, float fvol)
 {
 }
 
-sfx_t *S_PrecacheSound (const char *sample, qboolean complain, qboolean lock)
+sfx_t *S_PrecacheSound (const char *sample, qboolean complain, qboolean serversound)
 {
 	return NULL;
 }
 
+float S_SoundLength(const char *name)
+{
+	return -1;
+}
+
 qboolean S_IsSoundPrecached (const sfx_t *sfx)
 {
 	return false;
 }
 
+void S_UnloadAllSounds_f (void)
+{
+}
+
 sfx_t *S_FindName (const char *name)
 {
 	return NULL;
@@ -125,3 +148,22 @@ 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)
+{
+}