// rights reserved.
#include "quakedef.h"
+#include "cdaudio.h"
+#include "snd_main.h"
#define MAXTRACKS 256
{
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;
}
- if (cdPlaying && cdPlayTrack == track)
+ if (cdPlaying && cdPlayTrack == track && faketrack == -1)
return;
CDAudio_Stop ();
// 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)
+ if (sfx == NULL || sfx->fetcher == NULL)
sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, false);
if (sfx != NULL)
{
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);
}
}
int ret;
int n;
+ Host_StartVideo();
+
if (Cmd_Argc() < 2)
return;
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;
}