new cvar: mastervolume (controlling both volume and bgmvolume)

[xonotic/darkplaces.git] / snd_main.c

diff --git a/snd_main.c b/snd_main.c
index 6bd0b361c93a4ce6bf4257248af1b8791dc7844e..ce04f8051d93f901a78e01ebbff919b910139bf7 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -157,6 +157,7 @@ spatialmethod_t spatialmethod;
 
 // Cvars declared in sound.h (part of the sound API)
 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", "0.7", "master volume"};
 cvar_t volume = {CVAR_SAVE, "volume", "0.7", "volume of sound effects"};
 cvar_t snd_initialized = { CVAR_READONLY, "snd_initialized", "0", "indicates the sound subsystem is active"};
 cvar_t snd_staticvolume = {CVAR_SAVE, "snd_staticvolume", "1", "volume of ambient sound effects (such as swampy sounds at the start of e1m2)"};
@@ -771,6 +772,7 @@ void S_Init(void)
 {
        Cvar_RegisterVariable(&volume);
        Cvar_RegisterVariable(&bgmvolume);
+       Cvar_RegisterVariable(&mastervolume);
        Cvar_RegisterVariable(&snd_staticvolume);
        Cvar_RegisterVariable(&snd_entchannel0volume);
        Cvar_RegisterVariable(&snd_entchannel1volume);
@@ -1100,6 +1102,27 @@ sfx_t *S_PrecacheSound (const char *name, qboolean complain, qboolean serversoun
        return sfx;
 }
 
+/*
+==================
+S_SoundLength
+==================
+*/
+
+float S_SoundLength(const char *name)
+{
+       sfx_t *sfx;
+
+       if (!snd_initialized.integer)
+               return -1;
+       if (name == NULL || name[0] == 0)
+               return -1;
+
+       sfx = S_FindName(name);
+       if (sfx == NULL)
+               return -1;
+       return sfx->total_length / (float) S_GetSoundRate();
+}
+
 /*
 ==================
 S_IsSoundPrecached
@@ -1456,7 +1479,7 @@ void S_PlaySfxOnChannel (sfx_t *sfx, channel_t *target_chan, unsigned int flags,
 }
 
 
-int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
+int S_StartSound_StartPosition (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation, float startposition)
 {
        channel_t *target_chan, *check, *ch;
        int             ch_idx, startpos;
@@ -1493,16 +1516,19 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
        // if an identical sound has also been started this frame, offset the pos
        // a bit to keep it from just making the first one louder
        check = &channels[NUM_AMBIENTS];
-       startpos = 0;
-       for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++, check++)
+       startpos = (int)(startposition * S_GetSoundRate());
+       if (startpos == 0)
        {
-               if (check == target_chan)
-                       continue;
-               if (check->sfx == sfx && check->pos == 0)
+               for (ch_idx=NUM_AMBIENTS ; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS ; ch_idx++, check++)
                {
-                       // use negative pos offset to delay this sound effect
-                       startpos = (int)lhrandom(0, -0.1 * snd_renderbuffer->format.speed);
-                       break;
+                       if (check == target_chan)
+                               continue;
+                       if (check->sfx == sfx && check->pos == 0)
+                       {
+                               // use negative pos offset to delay this sound effect
+                               startpos = (int)lhrandom(0, -0.1 * snd_renderbuffer->format.speed);
+                               break;
+                       }
                }
        }
 
@@ -1511,6 +1537,11 @@ int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float f
        return (target_chan - channels);
 }
 
+int S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
+{
+       return S_StartSound_StartPosition(entnum, entchannel, sfx, origin, fvol, attenuation, 0);
+}
+
 void S_StopChannel (unsigned int channel_ind, qboolean lockmutex)
 {
        channel_t *ch;
@@ -1652,6 +1683,8 @@ float S_GetChannelPosition (unsigned int ch_ind)
        int s;
        channel_t *ch = &channels[ch_ind];
        sfx_t *sfx = ch->sfx;
+       if (!sfx)
+               return -1;
 
        s = ch->pos;
        /*
@@ -1661,7 +1694,19 @@ float S_GetChannelPosition (unsigned int ch_ind)
        return (s % sfx->total_length) / (float) S_GetSoundRate();
 }
 
+float S_GetEntChannelPosition(int entnum, int entchannel)
+{
+       channel_t *ch;
+       unsigned int i;
 
+       for (i = 0; i < total_channels; i++)
+       {
+               ch = &channels[i];
+               if (ch->entnum == entnum && ch->entchannel == entchannel)
+                       return S_GetChannelPosition(i);
+       }
+       return -1; // no playing sound in this channel
+}
 
 /*
 =================
@@ -1884,6 +1929,7 @@ static void S_PaintAndSubmit (void)
        oldsoundtime = soundtime;
 
        cls.soundstats.latency_milliseconds = (snd_renderbuffer->endframe - snd_renderbuffer->startframe) * 1000 / snd_renderbuffer->format.speed;
+       R_TimeReport("audiomix");
 }
 
 /*
@@ -1970,6 +2016,7 @@ void S_Update(const matrix4x4_t *listenermatrix)
        S_UpdateAmbientSounds ();
 
        combine = NULL;
+       R_TimeReport("audioprep");
 
        // update spatialization for static and dynamic sounds
        cls.soundstats.totalsounds = 0;
@@ -2023,6 +2070,7 @@ void S_Update(const matrix4x4_t *listenermatrix)
                if (k < SND_LISTENERS)
                        cls.soundstats.mixedsounds++;
        }
+       R_TimeReport("audiospatialize");
 
        sound_spatialized = true;