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);
{
unsigned int track;
sfx_t* sfx;
+ char filename[MAX_QPATH];
Host_StartVideo();
{
track = (unsigned char) atoi(trackname);
if(track > 0 && track < MAXTRACKS)
- if(*remap[track])
+ if(*remap[track])
+ {
+ if(strspn(remap[track], "0123456789") == strlen(remap[track]))
+ {
trackname = remap[track];
+ }
+ else
+ {
+ // ignore remappings to fake tracks if we're going to play a real track
+ switch(cdaudio.integer)
+ {
+ case 0: // we never access CD
+ case 1: // we have a replacement
+ trackname = remap[track];
+ break;
+ case 2: // we only use fake track replacement if CD track is invalid
+ CDAudio_GetAudioDiskInfo();
+ if(!cdValid || track > maxTrack)
+ trackname = remap[track];
+ break;
+ case 3: // we always play from CD - ignore this remapping then
+ case 4: // we randomize anyway
+ break;
+ }
+ }
+ }
}
if(strspn(trackname, "0123456789") == strlen(trackname))
else
track = 0;
+ // div0: I assume this code was intentionally there. Maybe turn it into a cvar?
if (cdPlaying && cdPlayTrack == track && faketrack == -1)
return;
CDAudio_Stop ();
// 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);
- 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);
+ 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);
- if (sfx == NULL || !S_IsSoundPrecached (sfx))
- sfx = S_PrecacheSound (va("cdtracks/%s", trackname), false, false);
- if (sfx == NULL || !S_IsSoundPrecached (sfx))
- sfx = S_PrecacheSound (va("%s.wav", trackname), false, false);
- if (sfx == NULL || !S_IsSoundPrecached (sfx))
- sfx = S_PrecacheSound (va("%s", 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)
{
if(cdaudio.integer != 0 || developer.integer) // we don't need these messages if only fake tracks can be played anyway
cdPlayTrack = track;
cdPlaying = true;
- if (cdvolume == 0.0)
+ if (cdvolume == 0.0 || bgmvolume.value == 0)
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 (void)
+{
+ if(faketrack != -1)
+ return S_GetChannelPosition(faketrack);
+ return -1;
+}
+
void CDAudio_Stop (void)
{
if (!enabled)
}
else if (cdPlaying && (CDAudio_SysStop() == -1))
return;
+ else if(wasPlaying)
+ {
+ CDAudio_Resume(); // needed by SDL - can't stop while paused there (causing pause/stop to fail after play, pause, stop, play otherwise)
+ if (cdPlaying && (CDAudio_SysStop() == -1))
+ return;
+ }
wasPlaying = false;
cdPlaying = false;
int ret;
int n;
- if (Cmd_Argc() < 2)
- return;
-
command = Cmd_Argv (1);
if (strcasecmp(command, "remap") != 0)
if (strcasecmp(command, "off") == 0)
{
- if (cdPlaying)
- CDAudio_Stop();
+ CDAudio_Stop();
enabled = false;
return;
}
if (strcasecmp(command, "reset") == 0)
{
enabled = true;
- if (cdPlaying)
- CDAudio_Stop();
+ CDAudio_Stop();
for (n = 0; n < MAXTRACKS; n++)
*remap[n] = 0; // empty string, that is, unremapped
CDAudio_GetAudioDiskInfo();
return;
}
+ if (strcasecmp(command, "rescan") == 0)
+ {
+ CDAudio_Shutdown();
+ CDAudio_Startup();
+ return;
+ }
+
if (strcasecmp(command, "remap") == 0)
{
ret = Cmd_Argc() - 2;
if (strcasecmp(command, "eject") == 0)
{
- if (cdPlaying && faketrack == -1)
+ if (faketrack == -1)
CDAudio_Stop();
CDAudio_Eject();
cdValid = false;
Con_Printf("Currently %s track %u\n", cdPlayLooping ? "looping" : "playing", cdPlayTrack);
else if (wasPlaying)
Con_Printf("Paused %s track %u\n", cdPlayLooping ? "looping" : "playing", cdPlayTrack);
- Con_Printf("Volume is %f\n", cdvolume);
+ if (cdvolume >= 0)
+ Con_Printf("Volume is %f\n", cdvolume);
+ else
+ Con_Printf("Can't get CD volume\n");
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 reset - resets CD audio system (clears track remapping and re-reads disc information)\n");
+ Con_Printf("cd rescan - rescans disks in drives (to use another disc)\n");
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");
return;
CDAudio_SetVolume (bgmvolume.value);
-
- if (faketrack == -1 && cdaudio.integer != 0)
+
+ if (faketrack == -1 && cdaudio.integer != 0 && bgmvolume.value != 0)
CDAudio_SysUpdate();
}
projects / xonotic / darkplaces.git / blobdiff