X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cd_shared.c;h=afca524a18a4f73c8d435ba74449cc61fb12bbd4;hb=5cf485940428b401e658f4351f65d1da08f93d36;hp=3f8b0d270eefdea2949c01696cf52e91512f5113;hpb=426d3967446d906a9612ae09e6748d3dad26c60f;p=xonotic%2Fdarkplaces.git diff --git a/cd_shared.c b/cd_shared.c index 3f8b0d27..afca524a 100644 --- a/cd_shared.c +++ b/cd_shared.c @@ -21,6 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // rights reserved. #include "quakedef.h" +#include "cdaudio.h" +#include "sound.h" + +#define MAXTRACKS 256 // Prototypes of the system dependent functions extern void CDAudio_SysEject (void); @@ -28,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 (qbyte track); +extern int CDAudio_SysPlay (unsigned char track); extern int CDAudio_SysStop (void); extern int CDAudio_SysPause (void); extern int CDAudio_SysResume (void); @@ -38,14 +42,14 @@ extern int CDAudio_SysStartup (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[100]; -static qbyte maxTrack; +static unsigned char remap[MAXTRACKS]; +static unsigned char maxTrack; static int faketrack = -1; static float saved_vol = 1.0f; @@ -54,8 +58,9 @@ 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) { @@ -91,40 +96,68 @@ static int CDAudio_GetAudioDiskInfo (void) } -void CDAudio_Play (qbyte track, qboolean looping) +void CDAudio_Play_byName (const char *trackname, qboolean looping) { + unsigned char 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); + track = remap[track]; + if (track < 1) + { + Con_Printf("CDAudio: Bad track number %u.\n", track); + return; + } } + else + track = 0; - if (cdPlaying && cdPlayTrack == track) + 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, true); + 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); + } + else + { + sfx = S_PrecacheSound (va("cdtracks/%s.wav", trackname), false, false); + } if (sfx != NULL) { faketrack = S_StartSound (-1, 0, sfx, vec3_origin, cdvolume, 0); if (faketrack != -1) { if (looping) - S_LoopChannel (faketrack, true); - Con_DPrintf ("Fake CD track %u playing...\n", track); + S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true); + S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true); + 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(); @@ -153,6 +186,12 @@ void CDAudio_Play (qbyte track, qboolean looping) 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) { @@ -177,7 +216,7 @@ void CDAudio_Pause (void) return; if (faketrack != -1) - S_PauseChannel (faketrack, true); + S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, true); else if (CDAudio_SysPause() == -1) return; @@ -192,7 +231,7 @@ void CDAudio_Resume (void) return; if (faketrack != -1) - S_PauseChannel (faketrack, false); + S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, false); else if (CDAudio_SysResume() == -1) return; cdPlaying = true; @@ -204,6 +243,8 @@ static void CD_f (void) int ret; int n; + Host_StartVideo(); + if (Cmd_Argc() < 2) return; @@ -228,7 +269,7 @@ static void CD_f (void) enabled = true; if (cdPlaying) CDAudio_Stop(); - for (n = 0; n < 100; n++) + for (n = 0; n < MAXTRACKS; n++) remap[n] = n; CDAudio_GetAudioDiskInfo(); return; @@ -239,7 +280,7 @@ static void CD_f (void) ret = Cmd_Argc() - 2; if (ret <= 0) { - for (n = 1; n < 100; n++) + for (n = 1; n < MAXTRACKS; n++) if (remap[n] != n) Con_Printf(" %u -> %u\n", n, remap[n]); return; @@ -257,13 +298,13 @@ static void CD_f (void) 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; } @@ -308,6 +349,20 @@ static void CD_f (void) 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 [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 - plays selected track in remapping table\n"); + Con_Printf("cd loop - 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) @@ -351,20 +406,20 @@ int CDAudio_Init (void) if (cls.state == ca_dedicated) return -1; -// COMMANDLINEOPTION: -nocdaudio disables CD audio support - if (COM_CheckParm("-nocdaudio") || COM_CheckParm("-safe")) +// COMMANDLINEOPTION: Sound: -nocdaudio disables CD audio support + if (COM_CheckParm("-nocdaudio")) return -1; CDAudio_SysInit(); - for (i = 0; i < 100; i++) + for (i = 0; i < MAXTRACKS; i++) remap[i] = i; 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; } @@ -375,22 +430,22 @@ int CDAudio_Startup (void) 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; }