merged R_DrawWorld into DrawSky/Draw so that rmain can just call DrawSky and Draw...

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index a7919448c805f3fcd4f631cc9341b7495ad5f119..6f15257090413e6da5f7f72a88e5b24d1757c07e 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -109,7 +109,7 @@ void CDAudio_Play (qbyte track, qboolean looping)
        sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false);
        if (sfx != NULL)
        {
-               faketrack = S_StartSound (-1, 0, sfx, vec3_origin, 1, 0);
+               faketrack = S_StartSound (-1, 0, sfx, vec3_origin, cdvolume, 0);
                if (faketrack != -1)
                {
                        if (looping)
@@ -184,7 +184,7 @@ void CDAudio_Pause (void)
 
 void CDAudio_Resume (void)
 {
-       if (!enabled || !wasPlaying)
+       if (!enabled || cdPlaying || !wasPlaying)
                return;
 
        if (faketrack != -1)
@@ -306,27 +306,39 @@ static void CD_f (void)
        }
 }
 
-void CDAudio_Update (void)
+void CDAudio_SetVolume (float newvol)
 {
-       if (!enabled)
+       // If the volume hasn't changed
+       if (newvol == cdvolume)
                return;
 
-       if (bgmvolume.value != cdvolume)
+       // If the CD has been muted
+       if (newvol == 0.0f)
+               CDAudio_Pause ();
+       else
        {
-               if (cdvolume)
-               {
-                       Cvar_SetValueQuick (&bgmvolume, 0.0);
-                       cdvolume = bgmvolume.value;
-                       CDAudio_Pause ();
-               }
+               // If the CD has been unmuted
+               if (cdvolume == 0.0f)
+                       CDAudio_Resume ();
+
+               if (faketrack != -1)
+                       S_SetChannelVolume (faketrack, newvol);
                else
                {
-                       Cvar_SetValueQuick (&bgmvolume, 1.0);
-                       cdvolume = bgmvolume.value;
-                       CDAudio_Resume ();
+                       // TODO: add support for the "real CD" mixer
                }
        }
 
+       cdvolume = newvol;
+}
+
+void CDAudio_Update (void)
+{
+       if (!enabled)
+               return;
+
+       CDAudio_SetVolume (bgmvolume.value);
+
        if (faketrack == -1)
                CDAudio_SysUpdate();
 }