X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=7706e91c3c05e61eb672d80235621b726e2ed7e8;hb=cbc820e3534a6dea25645c8242df02cf02e48679;hp=3bda8928091709306691dce08f86b341c6c1e815;hpb=379bc382cc0a532472654c50f6e91f0568f597a6;p=xonotic%2Fdarkplaces.git diff --git a/cd_shared.c b/cd_shared.c index 3bda8928..7706e91c 100644 --- a/cd_shared.c +++ b/cd_shared.c @@ -32,7 +32,7 @@ extern void CDAudio_SysCloseDoor (void); 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); @@ -43,6 +43,7 @@ extern void CDAudio_SysShutdown (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; @@ -67,6 +68,9 @@ static void CDAudio_Eject (void) { if (!enabled) return; + + if(cdaudio.integer == 0) + return; CDAudio_SysEject(); } @@ -77,6 +81,9 @@ static void CDAudio_CloseDoor (void) if (!enabled) return; + if(cdaudio.integer == 0) + return; + CDAudio_SysCloseDoor(); } @@ -86,6 +93,9 @@ static int CDAudio_GetAudioDiskInfo (void) cdValid = false; + if(cdaudio.integer == 0) + return -1; + ret = CDAudio_SysGetAudioDiskInfo(); if (ret < 1) return -1; @@ -96,11 +106,47 @@ static int CDAudio_GetAudioDiskInfo (void) 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 int track; sfx_t* sfx; + char filename[MAX_QPATH]; Host_StartVideo(); @@ -111,8 +157,32 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping) { 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)) @@ -127,28 +197,66 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping) 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 (); + 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); - 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); + 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) @@ -156,8 +264,12 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping) 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_DPrintf ("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_DPrintf ("BGM track %s playing...\n", trackname); } @@ -166,47 +278,41 @@ void CDAudio_Play_byName (const char *trackname, qboolean looping) // 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; - 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) @@ -214,11 +320,17 @@ void CDAudio_Stop (void) if (faketrack != -1) { - S_StopChannel (faketrack); + S_StopChannel (faketrack, true); faketrack = -1; } - else if (CDAudio_SysStop() == -1) + 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; @@ -257,13 +369,11 @@ static void CD_f (void) 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; @@ -272,8 +382,7 @@ static void CD_f (void) if (strcasecmp(command, "off") == 0) { - if (cdPlaying) - CDAudio_Stop(); + CDAudio_Stop(); enabled = false; return; } @@ -281,14 +390,20 @@ static void CD_f (void) 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; @@ -342,7 +457,7 @@ static void CD_f (void) if (strcasecmp(command, "eject") == 0) { - if (cdPlaying && faketrack == -1) + if (faketrack == -1) CDAudio_Stop(); CDAudio_Eject(); cdValid = false; @@ -360,14 +475,18 @@ static void CD_f (void) 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 [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"); @@ -396,7 +515,8 @@ void CDAudio_SetVolume (float newvol) if (faketrack != -1) S_SetChannelVolume (faketrack, newvol); - CDAudio_SysSetVolume (newvol); + else + CDAudio_SysSetVolume (newvol); } cdvolume = newvol; @@ -408,8 +528,8 @@ void CDAudio_Update (void) return; CDAudio_SetVolume (bgmvolume.value); - - if (faketrack == -1) + + if (faketrack == -1 && cdaudio.integer != 0 && bgmvolume.value != 0) CDAudio_SysUpdate(); } @@ -429,6 +549,7 @@ int CDAudio_Init (void) for (i = 0; i < MAXTRACKS; i++) *remap[i] = 0; + Cvar_RegisterVariable(&cdaudio); Cvar_RegisterVariable(&cdaudioinitialized); Cvar_SetValueQuick(&cdaudioinitialized, true); enabled = true;