send input for every client frame in singleplayer

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index a4cf1e82a7d3224bf2014f207654688cc0d9b167..afca524a18a4f73c8d435ba74449cc61fb12bbd4 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
 
@@ -42,7 +42,7 @@ 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;
@@ -60,6 +60,7 @@ qboolean cdPlaying = false;
 qboolean cdPlayLooping = false;
 unsigned char cdPlayTrack;
 
+cl_cdstate_t cd;
 
 static void CDAudio_Eject (void)
 {
@@ -95,8 +96,9 @@ static int CDAudio_GetAudioDiskInfo (void)
 }
 
 
-void CDAudio_Play (unsigned char track, qboolean looping)
+void CDAudio_Play_byName (const char *trackname, qboolean looping)
 {
+       unsigned char track;
        sfx_t* sfx;
 
        Host_StartVideo();
@@ -104,21 +106,34 @@ 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);
+               track = remap[track];
+               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);
+       }
+       else
+       {
+               sfx = S_PrecacheSound (va("cdtracks/%s.wav", trackname), false, false);
+       }
        if (sfx != NULL)
        {
                faketrack = S_StartSound (-1, 0, sfx, vec3_origin, cdvolume, 0);
@@ -127,13 +142,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,6 +186,12 @@ 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)
 {
@@ -268,13 +298,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;
        }
 
@@ -319,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 <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");
+       Con_Printf("cd play <tracknumber> - plays selected track in remapping table\n");
+       Con_Printf("cd loop <tracknumber> - 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)
@@ -363,7 +407,7 @@ 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();
@@ -375,7 +419,7 @@ int CDAudio_Init (void)
        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;
 }