#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;
+typedef char filename_t[MAX_QPATH];
+static filename_t 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_byName (const char *trackname, qboolean looping)
{
+ unsigned int track;
sfx_t* sfx;
+ Host_StartVideo();
+
if (!enabled)
return;
- track = remap[track];
- if (track < 1)
+ if(strspn(trackname, "0123456789") == strlen(trackname))
{
- Con_DPrintf("CDAudio: Bad track number %u.\n", track);
- return;
+ track = (unsigned char) atoi(trackname);
+ if(track > 0 && track < MAXTRACKS)
+ if(*remap[track])
+ trackname = remap[track];
+ }
+
+ if(strspn(trackname, "0123456789") == strlen(trackname))
+ {
+ track = (unsigned char) atoi(trackname);
+ if (track < 1)
+ {
+ Con_Printf("CDAudio: Bad track number %u.\n", track);
+ return;
+ }
}
+ else
+ track = 0;
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 == NULL || sfx->fetcher == NULL)
- sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, false);
+ if(track >= 1)
+ {
+ sfx = S_PrecacheSound (va ("cdtracks/track%02u.wav", track), false, false);
+ if (sfx == NULL || !S_IsSoundPrecached (sfx))
+ sfx = S_PrecacheSound (va ("cdtracks/track%03u.wav", track), false, false);
+ if (sfx == NULL || !S_IsSoundPrecached (sfx))
+ sfx = S_PrecacheSound (va ("cdtracks/track%02u", track), false, false);
+ if (sfx == NULL || !S_IsSoundPrecached (sfx))
+ sfx = S_PrecacheSound (va ("cdtracks/track%03u", track), false, false);
+ }
+ else
+ {
+ sfx = S_PrecacheSound (va("cdtracks/%s.wav", trackname), false, false);
+ if (sfx == NULL || !S_IsSoundPrecached (sfx))
+ sfx = S_PrecacheSound (va("cdtracks/%s", trackname), false, false);
+ }
if (sfx != NULL)
{
faketrack = S_StartSound (-1, 0, sfx, vec3_origin, cdvolume, 0);
if (looping)
S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
- Con_DPrintf ("Fake CD track %u playing...\n", track);
+ if(track >= 1)
+ Con_Printf ("Fake CD track %u playing...\n", track);
+ else
+ Con_Printf ("BGM track %s playing...\n", trackname);
}
}
// If we can't play a fake CD track, try the real one
if (faketrack == -1)
{
+ if(track < 1)
+ {
+ Con_Print("Could not load BGM track.\n");
+ return;
+ }
+
if (!cdValid)
{
CDAudio_GetAudioDiskInfo();
CDAudio_Pause ();
}
+void CDAudio_Play (unsigned char track, qboolean looping)
+{
+ char buf[20];
+ dpsnprintf(buf, sizeof(buf), "%d", (int) track);
+ CDAudio_Play_byName(buf, looping);
+}
void CDAudio_Stop (void)
{
- if (!enabled || !cdPlaying)
+ if (!enabled)
return;
if (faketrack != -1)
{
- S_StopChannel (faketrack);
+ S_StopChannel (faketrack, true);
faketrack = -1;
}
- else if (CDAudio_SysStop() == -1)
+ else if (cdPlaying && (CDAudio_SysStop() == -1))
return;
wasPlaying = false;
command = Cmd_Argv (1);
+ if (strcasecmp(command, "remap") != 0)
+ Host_StartVideo();
+
if (strcasecmp(command, "on") == 0)
{
enabled = true;
if (cdPlaying)
CDAudio_Stop();
for (n = 0; n < MAXTRACKS; n++)
- remap[n] = n;
+ *remap[n] = 0; // empty string, that is, unremapped
CDAudio_GetAudioDiskInfo();
return;
}
if (ret <= 0)
{
for (n = 1; n < MAXTRACKS; n++)
- if (remap[n] != n)
- Con_Printf(" %u -> %u\n", n, remap[n]);
+ if (*remap[n])
+ Con_Printf(" %u -> %s\n", n, remap[n]);
return;
}
for (n = 1; n <= ret; n++)
- remap[n] = atoi(Cmd_Argv (n+1));
+ strlcpy(remap[n], Cmd_Argv (n+1), sizeof(*remap));
return;
}
if (strcasecmp(command, "play") == 0)
{
- CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), false);
+ CDAudio_Play_byName(Cmd_Argv (2), false);
return;
}
if (strcasecmp(command, "loop") == 0)
{
- CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), true);
+ CDAudio_Play_byName(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)
return -1;
// COMMANDLINEOPTION: Sound: -nocdaudio disables CD audio support
- if (COM_CheckParm("-nocdaudio") || COM_CheckParm("-safe"))
+ if (COM_CheckParm("-nocdaudio"))
return -1;
CDAudio_SysInit();
for (i = 0; i < MAXTRACKS; i++)
- remap[i] = i;
+ *remap[i] = 0;
Cvar_RegisterVariable(&cdaudioinitialized);
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;
}
int CDAudio_Startup (void)
{
+ if (COM_CheckParm("-nocdaudio"))
+ return -1;
+
CDAudio_SysStartup ();
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;
}
projects / xonotic / darkplaces.git / blobdiff