Fix the makefile not to use the unused gl_models.c

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index 9cedbac1e8fae162c40914d567fbb47502f9ca3a..5d093e73292a0b86f258dd7419c5b576d36900ed 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -99,13 +99,15 @@ void CDAudio_Play (qbyte track, qboolean looping)
 {
        sfx_t* sfx;
 
+       Host_StartVideo();
+
        if (!enabled)
                return;
 
        track = remap[track];
        if (track < 1)
        {
-               Con_DPrintf("CDAudio: Bad track number %u.\n", track);
+               Con_Printf("CDAudio: Bad track number %u.\n", track);
                return;
        }
 
@@ -115,7 +117,6 @@ void CDAudio_Play (qbyte track, qboolean looping)
 
        // Try playing a fake track (sound file) first
        sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, false);
-       // FIXME: perhaps force it to be always %03u (but for compatibility?):
        if (sfx == NULL || sfx->fetcher == NULL)
                sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, false);
        if (sfx != NULL)
@@ -126,7 +127,7 @@ void CDAudio_Play (qbyte track, qboolean looping)
                        if (looping)
                                S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
                        S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
-                       Con_DPrintf ("Fake CD track %u playing...\n", track);
+                       Con_Printf ("Fake CD track %u playing...\n", track);
                }
        }
 
@@ -212,6 +213,8 @@ static void CD_f (void)
        int ret;
        int n;
 
+       Host_StartVideo();
+
        if (Cmd_Argc() < 2)
                return;
 
@@ -383,22 +386,22 @@ int CDAudio_Startup (void)
 
        if (CDAudio_GetAudioDiskInfo())
        {
-               Con_DPrint("CDAudio_Init: No CD in player.\n");
+               Con_Print("CDAudio_Init: No CD in player.\n");
                cdValid = false;
        }
 
        saved_vol = CDAudio_SysGetVolume ();
        if (saved_vol < 0.0f)
        {
-               Con_DPrint ("Can't get initial CD volume\n");
+               Con_Print ("Can't get initial CD volume\n");
                saved_vol = 1.0f;
        }
        else
-               Con_DPrintf ("Initial CD volume: %g\n", saved_vol);
+               Con_Printf ("Initial CD volume: %g\n", saved_vol);
 
        initialized = true;
 
-       Con_DPrint("CD Audio Initialized\n");
+       Con_Print("CD Audio Initialized\n");
 
        return 0;
 }