#include "quakedef.h"
#include "cdaudio.h"
-#include "snd_main.h"
+#include "sound.h"
#define MAXTRACKS 256
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);
extern void CDAudio_SysShutdown (void);
// used by menu to ghost CD audio slider
-cvar_t cdaudioinitialized = {CVAR_READONLY,"cdaudioinitialized","0"};
+cvar_t cdaudioinitialized = {CVAR_READONLY,"cdaudioinitialized","0","indicates if CD Audio system is active"};
static qboolean wasPlaying = false;
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;
+cl_cdstate_t cd;
static void CDAudio_Eject (void)
{
}
-void CDAudio_Play (qbyte track, qboolean looping)
+void CDAudio_Play (unsigned char track, qboolean looping)
{
sfx_t* sfx;
// Try playing a fake track (sound file) first
sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, false);
- if (sfx == NULL || sfx->fetcher == NULL)
+ if (sfx == NULL || !S_IsSoundPrecached (sfx))
sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, false);
if (sfx != NULL)
{
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;
}
Con_Printf("Volume is %f\n", cdvolume);
return;
}
+
+ Con_Printf("CD commands:\n");
+ Con_Printf("cd on - enables CD audio system\n");
+ Con_Printf("cd off - stops and disables CD audio system\n");
+ Con_Printf("cd reset - resets CD audio system (clears track remapping and re-reads disc information)");
+ Con_Printf("cd remap <remap1> [remap2] [remap3] [...] - chooses (possibly emulated) CD tracks to play when a map asks for a particular track, this has many uses\n");
+ Con_Printf("cd close - closes CD tray\n");
+ Con_Printf("cd eject - stops playing music and opens CD tray to allow you to change disc\n");
+ Con_Printf("cd play <tracknumber> - plays selected track in remapping table\n");
+ Con_Printf("cd loop <tracknumber> - plays and repeats selected track in remapping table\n");
+ Con_Printf("cd stop - stops playing current CD track\n");
+ Con_Printf("cd pause - pauses CD playback\n");
+ Con_Printf("cd resume - unpauses CD playback\n");
+ Con_Printf("cd info - prints basic disc information (number of tracks, currently playing track, volume level)\n");
}
void CDAudio_SetVolume (float newvol)
Cvar_SetValueQuick(&cdaudioinitialized, true);
enabled = true;
- Cmd_AddCommand("cd", CD_f);
+ Cmd_AddCommand("cd", CD_f, "execute a CD drive command (cd on/off/reset/remap/close/play/loop/stop/pause/resume/eject/info) - use cd by itself for usage");
return 0;
}