changed a lot of Con_DPrint/Con_DPrintf calls to Con_Print/Con_Printf (non-technical...

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index a7919448c805f3fcd4f631cc9341b7495ad5f119..48dc4990c181fa914a2afa41101cd31846468f81 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -21,11 +21,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // rights reserved.
 
 #include "quakedef.h"
+#include "cdaudio.h"
+#include "snd_main.h"
+
+#define MAXTRACKS      256
 
 // Prototypes of the system dependent functions
 extern void CDAudio_SysEject (void);
 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_SysStop (void);
 extern int CDAudio_SysPause (void);
@@ -42,10 +48,12 @@ static qboolean wasPlaying = false;
 static qboolean initialized = false;
 static qboolean enabled = false;
 static float cdvolume;
-static qbyte remap[100];
+static qbyte remap[MAXTRACKS];
 static qbyte maxTrack;
 static int faketrack = -1;
 
+static float saved_vol = 1.0f;
+
 // exported variables
 qboolean cdValid = false;
 qboolean cdPlaying = false;
@@ -97,24 +105,27 @@ void CDAudio_Play (qbyte track, qboolean looping)
        track = remap[track];
        if (track < 1)
        {
-               Con_DPrintf("CDAudio: Bad track number %u.\n", track);
+               Con_Printf("CDAudio: Bad track number %u.\n", track);
                return;
        }
 
-       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);
+       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 (sfx != NULL)
        {
-               faketrack = S_StartSound (-1, 0, sfx, vec3_origin, 1, 0);
+               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);
+                       Con_Printf ("Fake CD track %u playing...\n", track);
                }
        }
 
@@ -133,7 +144,7 @@ void CDAudio_Play (qbyte track, qboolean looping)
 
                if (track > maxTrack)
                {
-                       Con_DPrintf("CDAudio: Bad track number %u.\n", track);
+                       Con_Printf("CDAudio: Bad track number %u.\n", track);
                        return;
                }
 
@@ -173,7 +184,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;
 
@@ -184,11 +195,11 @@ void CDAudio_Pause (void)
 
 void CDAudio_Resume (void)
 {
-       if (!enabled || !wasPlaying)
+       if (!enabled || cdPlaying || !wasPlaying)
                return;
 
        if (faketrack != -1)
-               S_PauseChannel (faketrack, false);
+               S_SetChannelFlag (faketrack, CHANNELFLAG_PAUSED, false);
        else if (CDAudio_SysResume() == -1)
                return;
        cdPlaying = true;
@@ -224,7 +235,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;
@@ -235,7 +246,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;
@@ -306,27 +317,36 @@ static void CD_f (void)
        }
 }
 
-void CDAudio_Update (void)
+void CDAudio_SetVolume (float newvol)
 {
-       if (!enabled)
+       // If the volume hasn't changed
+       if (newvol == cdvolume)
                return;
 
-       if (bgmvolume.value != cdvolume)
+       // If the CD has been muted
+       if (newvol == 0.0f)
+               CDAudio_Pause ();
+       else
        {
-               if (cdvolume)
-               {
-                       Cvar_SetValueQuick (&bgmvolume, 0.0);
-                       cdvolume = bgmvolume.value;
-                       CDAudio_Pause ();
-               }
-               else
-               {
-                       Cvar_SetValueQuick (&bgmvolume, 1.0);
-                       cdvolume = bgmvolume.value;
+               // If the CD has been unmuted
+               if (cdvolume == 0.0f)
                        CDAudio_Resume ();
-               }
+
+               if (faketrack != -1)
+                       S_SetChannelVolume (faketrack, newvol);
+               CDAudio_SysSetVolume (newvol);
        }
 
+       cdvolume = newvol;
+}
+
+void CDAudio_Update (void)
+{
+       if (!enabled)
+               return;
+
+       CDAudio_SetVolume (bgmvolume.value);
+
        if (faketrack == -1)
                CDAudio_SysUpdate();
 }
@@ -338,12 +358,13 @@ int CDAudio_Init (void)
        if (cls.state == ca_dedicated)
                return -1;
 
+// COMMANDLINEOPTION: Sound: -nocdaudio disables CD audio support
        if (COM_CheckParm("-nocdaudio") || COM_CheckParm("-safe"))
                return -1;
 
        CDAudio_SysInit();
 
-       for (i = 0; i < 100; i++)
+       for (i = 0; i < MAXTRACKS; i++)
                remap[i] = i;
 
        Cvar_RegisterVariable(&cdaudioinitialized);
@@ -361,13 +382,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_Print ("Can't get initial CD volume\n");
+               saved_vol = 1.0f;
+       }
+       else
+               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;
 }
@@ -376,6 +406,9 @@ void CDAudio_Shutdown (void)
 {
        if (!initialized)
                return;
+
+       CDAudio_SysSetVolume (saved_vol);
+
        CDAudio_Stop();
        CDAudio_SysShutdown();
        initialized = false;