new cvar: mastervolume (controlling both volume and bgmvolume)

[xonotic/darkplaces.git] / snd_null.c

diff --git a/snd_null.c b/snd_null.c
index c8aa087420ca897e2e9a26e4c44992916bd2099a..bc71a4f30835082a6164a480c8c333bcccdd7817 100755 (executable)
--- a/snd_null.c
+++ b/snd_null.c
@@ -23,6 +23,7 @@ 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"};
@@ -31,6 +32,7 @@ cvar_t snd_mutewhenidle = {CVAR_SAVE, "snd_mutewhenidle", "1", "whether to disab
 void S_Init (void)
 {
        Cvar_RegisterVariable(&bgmvolume);
+       Cvar_RegisterVariable(&mastervolume);
        Cvar_RegisterVariable(&volume);
        Cvar_RegisterVariable(&snd_staticvolume);
        Cvar_RegisterVariable(&snd_initialized);
@@ -67,6 +69,11 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
        return -1;
 }
 
+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)
 {
 }
@@ -93,6 +100,11 @@ sfx_t *S_PrecacheSound (const char *sample, qboolean complain, qboolean serverso
        return NULL;
 }
 
+float S_SoundLength(const char *name)
+{
+       return -1;
+}
+
 qboolean S_IsSoundPrecached (const sfx_t *sfx)
 {
        return false;
@@ -141,3 +153,17 @@ 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)
+{
+}