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 d1106c3701adab518d52025ba2f894034f64b059..c486fe562098e22c75f1dc1c279843c1d4898e19 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -110,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);
                }
        }
@@ -137,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;
                }
 
@@ -177,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;
 
@@ -192,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;
@@ -351,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;
 
@@ -380,7 +382,12 @@ int CDAudio_Startup (void)
 
        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;