X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=snd_null.c;h=8385964425053d17c5f7a18f664b6bb219ba2101;hb=e24277377e64376fe6a8bbbdfad73f614f3909bf;hp=3da10596c4638b1eb896c0e084cf2e9b2e66db36;hpb=574d932f7ca45620b2cd383a9a9275defc41dfca;p=xonotic%2Fdarkplaces.git

diff --git a/snd_null.c b/snd_null.c
index 3da10596..83859644 100755
--- a/snd_null.c
+++ b/snd_null.c
@@ -23,20 +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_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"};
+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_mixahead);
-	Cvar_RegisterVariable(&snd_swapstereo);
 	Cvar_RegisterVariable(&snd_initialized);
+	Cvar_RegisterVariable(&snd_mutewhenidle);
 }
 
 void S_Terminate (void)
@@ -51,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)
 {
 }
@@ -64,7 +69,17 @@ 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;
+}
+
+int S_StartSound_StartPosition_Flags (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation, float startposition, int flags)
+{
+	return -1;
+}
+
+void S_StopChannel (unsigned int channel_ind, qboolean lockmutex, qboolean freesfx)
 {
 }
 
@@ -85,16 +100,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 levelsound)
 {
 	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;
@@ -116,3 +140,35 @@ qboolean S_LocalSound (const char *s)
 {
 	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)
+{
+}