eliminated qbyte type, now uses unsigned char throughout the engine for this purpose

[xonotic/darkplaces.git] / cd_shared.c

diff --git a/cd_shared.c b/cd_shared.c
index d1106c3701adab518d52025ba2f894034f64b059..a4cf1e82a7d3224bf2014f207654688cc0d9b167 100644 (file)
--- 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 "snd_main.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);
@@ -44,8 +48,8 @@ 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,7 +58,7 @@ static float saved_vol = 1.0f;
 qboolean cdValid = false;
 qboolean cdPlaying = false;
 qboolean cdPlayLooping = false;
-qbyte cdPlayTrack;
+unsigned char cdPlayTrack;
 
 
 static void CDAudio_Eject (void)
@@ -91,34 +95,39 @@ static int CDAudio_GetAudioDiskInfo (void)
 }
 
 
-void CDAudio_Play (qbyte track, qboolean looping)
+void CDAudio_Play (unsigned char track, qboolean looping)
 {
        sfx_t* sfx;
 
+       Host_StartVideo();
+
        if (!enabled)
                return;
 
        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, 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);
                }
        }
 
@@ -137,7 +146,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;
                }
 
@@ -177,7 +186,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 +201,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 +213,8 @@ static void CD_f (void)
        int ret;
        int n;
 
+       Host_StartVideo();
+
        if (Cmd_Argc() < 2)
                return;
 
@@ -228,7 +239,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 +250,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 +268,13 @@ static void CD_f (void)
 
        if (strcasecmp(command, "play") == 0)
        {
-               CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), false);
+               CDAudio_Play((unsigned char)atoi(Cmd_Argv (2)), false);
                return;
        }
 
        if (strcasecmp(command, "loop") == 0)
        {
-               CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), true);
+               CDAudio_Play((unsigned char)atoi(Cmd_Argv (2)), true);
                return;
        }
 
@@ -351,12 +362,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);
@@ -374,17 +386,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;
 }