don't check visframe on q3bsp surfaces, it's not used

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index 6f15257090413e6da5f7f72a88e5b24d1757c07e..c486fe562098e22c75f1dc1c279843c1d4898e19 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -26,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 extern void CDAudio_SysEject (void);
 extern void CDAudio_SysCloseDoor (void);
 extern int CDAudio_SysGetAudioDiskInfo (void);
+extern float CDAudio_SysGetVolume (void);
+extern void CDAudio_SysSetVolume (float volume);
 extern int CDAudio_SysPlay (qbyte track);
 extern int CDAudio_SysStop (void);
 extern int CDAudio_SysPause (void);
@@ -46,6 +48,8 @@ static qbyte remap[100];
 static qbyte maxTrack;
 static int faketrack = -1;
 
+static float saved_vol = 1.0f;
+
 // exported variables
 qboolean cdValid = false;
 qboolean cdPlaying = false;
@@ -106,14 +110,15 @@ void CDAudio_Play (qbyte track, qboolean looping)
        CDAudio_Stop ();
 
        // Try playing a fake track (sound file) first
-       sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false);
+       sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, true, false);
        if (sfx != NULL)
        {
                faketrack = S_StartSound (-1, 0, sfx, vec3_origin, cdvolume, 0);
                if (faketrack != -1)
                {
                        if (looping)
-                       S_LoopChannel (faketrack, true);
+                               S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
+                       S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
                        Con_DPrintf ("Fake CD track %u playing...\n", track);
                }
        }
@@ -133,7 +138,7 @@ void CDAudio_Play (qbyte track, qboolean looping)
 
                if (track > maxTrack)
                {
-                       Con_DPrintf("CDAudio: Bad track number %u.\n", track);
+                       Con_Printf("CDAudio: Bad track number %u.\n", track);
                        return;
                }
 
@@ -173,7 +178,7 @@ void CDAudio_Pause (void)
                return;
 
        if (faketrack != -1)
-               S_PauseChannel (faketrack, true);
+               S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, true);
        else if (CDAudio_SysPause() == -1)
                return;
 
@@ -188,7 +193,7 @@ void CDAudio_Resume (void)
                return;
 
        if (faketrack != -1)
-               S_PauseChannel (faketrack, false);
+               S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, false);
        else if (CDAudio_SysResume() == -1)
                return;
        cdPlaying = true;
@@ -323,10 +328,7 @@ void CDAudio_SetVolume (float newvol)
 
                if (faketrack != -1)
                        S_SetChannelVolume (faketrack, newvol);
-               else
-               {
-                       // TODO: add support for the "real CD" mixer
-               }
+               CDAudio_SysSetVolume (newvol);
        }
 
        cdvolume = newvol;
@@ -350,6 +352,7 @@ int CDAudio_Init (void)
        if (cls.state == ca_dedicated)
                return -1;
 
+// COMMANDLINEOPTION: Sound: -nocdaudio disables CD audio support
        if (COM_CheckParm("-nocdaudio") || COM_CheckParm("-safe"))
                return -1;
 
@@ -377,6 +380,15 @@ int CDAudio_Startup (void)
                cdValid = false;
        }
 
+       saved_vol = CDAudio_SysGetVolume ();
+       if (saved_vol < 0.0f)
+       {
+               Con_DPrint ("Can't get initial CD volume\n");
+               saved_vol = 1.0f;
+       }
+       else
+               Con_DPrintf ("Initial CD volume: %g\n", saved_vol);
+
        initialized = true;
 
        Con_DPrint("CD Audio Initialized\n");
@@ -388,6 +400,9 @@ void CDAudio_Shutdown (void)
 {
        if (!initialized)
                return;
+
+       CDAudio_SysSetVolume (saved_vol);
+
        CDAudio_Stop();
        CDAudio_SysShutdown();
        initialized = false;