extern int CDAudio_SysGetAudioDiskInfo (void);
extern float CDAudio_SysGetVolume (void);
extern void CDAudio_SysSetVolume (float volume);
-extern int CDAudio_SysPlay (unsigned char track);
+extern int CDAudio_SysPlay (int track);
extern int CDAudio_SysStop (void);
extern int CDAudio_SysPause (void);
extern int CDAudio_SysResume (void);
// used by menu to ghost CD audio slider
cvar_t cdaudioinitialized = {CVAR_READONLY,"cdaudioinitialized","0","indicates if CD Audio system is active"};
+cvar_t cdaudio = {CVAR_SAVE,"cdaudio","1","CD playing mode (0 = never access CD drive, 1 = play CD tracks if no replacement available, 2 = play fake tracks if no CD track available, 3 = play only real CD tracks, 4 = play real CD tracks even instead of named fake tracks)"};
static qboolean wasPlaying = false;
static qboolean initialized = false;
static qboolean enabled = false;
static float cdvolume;
-static unsigned char remap[MAXTRACKS];
+typedef char filename_t[MAX_QPATH];
+static filename_t remap[MAXTRACKS];
static unsigned char maxTrack;
static int faketrack = -1;
{
if (!enabled)
return;
+
+ if(cdaudio.integer == 0)
+ return;
CDAudio_SysEject();
}
if (!enabled)
return;
+ if(cdaudio.integer == 0)
+ return;
+
CDAudio_SysCloseDoor();
}
cdValid = false;
+ if(cdaudio.integer == 0)
+ return -1;
+
ret = CDAudio_SysGetAudioDiskInfo();
if (ret < 1)
return -1;
return 0;
}
+qboolean CDAudio_Play_real (int track, qboolean looping, qboolean complain)
+{
+ if(track < 1)
+ {
+ if(complain)
+ Con_Print("Could not load BGM track.\n");
+ return false;
+ }
+
+ if (!cdValid)
+ {
+ CDAudio_GetAudioDiskInfo();
+ if (!cdValid)
+ {
+ if(complain)
+ Con_Print ("No CD in player.\n");
+ return false;
+ }
+ }
+
+ if (track > maxTrack)
+ {
+ if(complain)
+ Con_Printf("CDAudio: Bad track number %u.\n", track);
+ return false;
+ }
+
+ if (CDAudio_SysPlay(track) == -1)
+ return false;
+
+ if(cdaudio.integer != 3 || developer.integer)
+ Con_Printf ("CD track %u playing...\n", track);
+
+ return true;
+}
void CDAudio_Play_byName (const char *trackname, qboolean looping)
{
- unsigned char track;
+ unsigned int track;
sfx_t* sfx;
+ char filename[MAX_QPATH];
Host_StartVideo();
if(strspn(trackname, "0123456789") == strlen(trackname))
{
track = (unsigned char) atoi(trackname);
- track = remap[track];
+ 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;
CDAudio_Stop ();
+ if(track >= 1)
+ {
+ if(cdaudio.integer == 3) // only play real CD tracks at all
+ {
+ if(CDAudio_Play_real(track, looping, true))
+ goto success;
+ return;
+ }
+
+ if(cdaudio.integer == 2) // prefer real CD track over fake
+ {
+ if(CDAudio_Play_real(track, looping, false))
+ goto success;
+ }
+ }
+
+ if(cdaudio.integer == 4) // only play real CD tracks, EVEN instead of fake tracks!
+ {
+ if(CDAudio_Play_real(track, looping, false))
+ goto success;
+
+ if(cdValid && maxTrack > 0)
+ {
+ track = 1 + (rand() % maxTrack);
+ if(CDAudio_Play_real(track, looping, true))
+ goto success;
+ }
+ else
+ {
+ Con_Print ("No CD in player.\n");
+ }
+ return;
+ }
+
// Try playing a fake track (sound file) first
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);
+ dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%03u.wav", track);
+ if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%03u.ogg", track);
+ if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%02u.wav", track);
+ if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/track%02u.ogg", track);
}
else
{
- sfx = S_PrecacheSound (va("cdtracks/%s.wav", trackname), false, false);
+ dpsnprintf(filename, sizeof(filename), "%s", trackname);
+ if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "%s.wav", trackname);
+ if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "%s.ogg", trackname);
+ if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/%s", trackname);
+ if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/%s.wav", trackname);
+ if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/%s.ogg", trackname);
+ if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/%s", trackname);
+ if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/%s.wav", trackname);
+ if (!FS_FileExists(filename)) dpsnprintf(filename, sizeof(filename), "sound/cdtracks/%s.ogg", trackname);
}
- if (sfx != NULL)
+ if (FS_FileExists(filename) && (sfx = S_PrecacheSound (filename, false, true)))
{
faketrack = S_StartSound (-1, 0, sfx, vec3_origin, cdvolume, 0);
if (faketrack != -1)
if (looping)
S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
+ S_SetChannelFlag (faketrack, CHANNELFLAG_LOCALSOUND, true); // not pausable
if(track >= 1)
- Con_Printf ("Fake CD track %u playing...\n", track);
+ {
+ if(cdaudio.integer != 0 || developer.integer) // we don't need these messages if only fake tracks can be played anyway
+ Con_Printf ("Fake CD track %u playing...\n", track);
+ }
else
- Con_Printf ("BGM track %s playing...\n", trackname);
+ Con_DPrintf ("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)
+ if(cdaudio.integer == 0 || track < 1)
{
Con_Print("Could not load BGM track.\n");
return;
}
-
- if (!cdValid)
+ else
{
- CDAudio_GetAudioDiskInfo();
- if (!cdValid)
- {
- Con_Print ("No CD in player.\n");
+ if(!CDAudio_Play_real(track, looping, true))
return;
- }
}
-
- if (track > maxTrack)
- {
- Con_Printf("CDAudio: Bad track number %u.\n", track);
- return;
- }
-
- if (CDAudio_SysPlay(track) == -1)
- return;
}
+success:
cdPlayLooping = looping;
cdPlayTrack = track;
cdPlaying = true;
CDAudio_Pause ();
}
-void CDAudio_Play (unsigned char track, qboolean looping)
+void CDAudio_Play (int track, qboolean looping)
{
char buf[20];
dpsnprintf(buf, sizeof(buf), "%d", (int) track);
CDAudio_Play_byName(buf, looping);
}
+float CDAudio_GetPosition ()
+{
+ if(faketrack != -1)
+ return S_GetChannelPosition(faketrack);
+ return -1;
+}
+
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;
int ret;
int n;
- Host_StartVideo();
-
if (Cmd_Argc() < 2)
return;
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 (faketrack != -1)
S_SetChannelVolume (faketrack, newvol);
- CDAudio_SysSetVolume (newvol);
+ else
+ CDAudio_SysSetVolume (newvol);
}
cdvolume = newvol;
CDAudio_SetVolume (bgmvolume.value);
- if (faketrack == -1)
+ if (faketrack == -1 && cdaudio.integer != 0)
CDAudio_SysUpdate();
}
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(&cdaudio);
Cvar_RegisterVariable(&cdaudioinitialized);
Cvar_SetValueQuick(&cdaudioinitialized, true);
enabled = true;
int CDAudio_Startup (void)
{
+ if (COM_CheckParm("-nocdaudio"))
+ return -1;
+
CDAudio_SysStartup ();
if (CDAudio_GetAudioDiskInfo())
projects / xonotic / darkplaces.git / blobdiff