redesigned csqc shared entity .Version handling, now internally uses a

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index 9bca5e5b150d5519e775f667062d3cf4d3c2109e..aa33079dd2ea55710e50481907f3a85cb5918734 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include "cdaudio.h"
-#include "snd_main.h"
+#include "sound.h"
 
 #define MAXTRACKS      256
 
@@ -48,7 +48,8 @@ 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;
 
@@ -60,6 +61,7 @@ qboolean cdPlaying = false;
 qboolean cdPlayLooping = false;
 unsigned char cdPlayTrack;
 
+cl_cdstate_t cd;
 
 static void CDAudio_Eject (void)
 {
@@ -95,8 +97,9 @@ static int CDAudio_GetAudioDiskInfo (void)
 }
 
 
-void CDAudio_Play (unsigned char track, qboolean looping)
+void CDAudio_Play_byName (const char *trackname, qboolean looping)
 {
+       unsigned int track;
        sfx_t* sfx;
 
        Host_StartVideo();
@@ -104,21 +107,47 @@ void CDAudio_Play (unsigned char track, qboolean looping)
        if (!enabled)
                return;
 
-       track = remap[track];
-       if (track < 1)
+       if(strspn(trackname, "0123456789") == strlen(trackname))
        {
-               Con_Printf("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);
-       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);
@@ -127,13 +156,22 @@ void CDAudio_Play (unsigned char track, qboolean looping)
                        if (looping)
                                S_SetChannelFlag (faketrack, CHANNELFLAG_FORCELOOP, true);
                        S_SetChannelFlag (faketrack, CHANNELFLAG_FULLVOLUME, true);
-                       Con_Printf ("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();
@@ -162,18 +200,24 @@ void CDAudio_Play (unsigned char 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)
 {
-       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;
@@ -213,13 +257,14 @@ 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;
@@ -240,7 +285,7 @@ static void CD_f (void)
                if (cdPlaying)
                        CDAudio_Stop();
                for (n = 0; n < MAXTRACKS; n++)
-                       remap[n] = n;
+                       *remap[n] = 0; // empty string, that is, unremapped
                CDAudio_GetAudioDiskInfo();
                return;
        }
@@ -251,12 +296,12 @@ static void CD_f (void)
                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;
        }
 
@@ -268,13 +313,13 @@ static void CD_f (void)
 
        if (strcasecmp(command, "play") == 0)
        {
-               CDAudio_Play((unsigned char)atoi(Cmd_Argv (2)), false);
+               CDAudio_Play_byName(Cmd_Argv (2), false);
                return;
        }
 
        if (strcasecmp(command, "loop") == 0)
        {
-               CDAudio_Play((unsigned char)atoi(Cmd_Argv (2)), true);
+               CDAudio_Play_byName(Cmd_Argv (2), true);
                return;
        }
 
@@ -377,13 +422,13 @@ int CDAudio_Init (void)
                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);
@@ -396,6 +441,9 @@ int CDAudio_Init (void)
 
 int CDAudio_Startup (void)
 {
+       if (COM_CheckParm("-nocdaudio"))
+               return -1;
+
        CDAudio_SysStartup ();
 
        if (CDAudio_GetAudioDiskInfo())