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_SysPlay (unsigned char track);
extern int CDAudio_SysStop (void);
extern int CDAudio_SysPause (void);
extern int CDAudio_SysResume (void);
static qboolean initialized = false;
static qboolean enabled = false;
static float cdvolume;
-static qbyte remap[MAXTRACKS];
-static qbyte maxTrack;
+static unsigned char remap[MAXTRACKS];
+static unsigned char maxTrack;
static int faketrack = -1;
static float saved_vol = 1.0f;
qboolean cdValid = false;
qboolean cdPlaying = false;
qboolean cdPlayLooping = false;
-qbyte cdPlayTrack;
+unsigned char cdPlayTrack;
static void CDAudio_Eject (void)
}
-void CDAudio_Play (qbyte track, qboolean looping)
+void CDAudio_Play (unsigned char 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;
}
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 (strcasecmp(command, "play") == 0)
{
- CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), false);
+ CDAudio_Play((unsigned char)atoi(Cmd_Argv (2)), false);
return;
}
if (strcasecmp(command, "loop") == 0)
{
- CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), true);
+ CDAudio_Play((unsigned char)atoi(Cmd_Argv (2)), true);
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;
}