Fixed a MSVC6 warning in matrixlib. Added a "Public server" yes/no line in the server...

[xonotic/darkplaces.git] / cd_linux.c

diff --git a/cd_linux.c b/cd_linux.c
index 5a37ff2075f2bf778320a10b1b50fbc82afd31ec..eb8ef45f0abf11570930783c31625b0f78feaf12 100644 (file)
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -35,16 +35,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 
+// used by menu to ghost CD audio slider
+qboolean cdaudioinitialized = false;
 static qboolean cdValid = false;
-static qboolean        playing = false;
-static qboolean        wasPlaying = false;
-static qboolean        initialized = false;
-static qboolean        enabled = true;
+static qboolean playing = false;
+static qboolean wasPlaying = false;
+static qboolean initialized = false;
+static qboolean enabled = true;
 static qboolean playLooping = false;
-static float   cdvolume;
-static byte    remap[100];
-static byte            playTrack;
-static byte            maxTrack;
+static float cdvolume;
+static qbyte remap[100];
+static qbyte playTrack;
+static qbyte maxTrack;
 
 static int cdfile = -1;
 static char cd_dev[64] = "/dev/cdrom";
@@ -93,7 +95,7 @@ static int CDAudio_GetAudioDiskInfo(void)
 }
 
 
-void CDAudio_Play(byte track, qboolean looping)
+void CDAudio_Play(qbyte track, qboolean looping)
 {
        struct cdrom_tocentry entry;
        struct cdrom_ti ti;
@@ -202,16 +204,16 @@ void CDAudio_Resume(void)
        if (!wasPlaying)
                return;
        
-       if ( ioctl(cdfile, CDROMRESUME) == -1 ) 
+       if ( ioctl(cdfile, CDROMRESUME) == -1 )
                Con_DPrintf("ioctl cdromresume failed\n");
        playing = true;
 }
 
 static void CD_f (void)
 {
-       char    *command;
-       int             ret;
-       int             n;
+       const char      *command;
+       int                     ret;
+       int                     n;
 
        if (Cmd_Argc() < 2)
                return;
@@ -276,13 +278,13 @@ static void CD_f (void)
 
        if (Q_strcasecmp(command, "play") == 0)
        {
-               CDAudio_Play((byte)atoi(Cmd_Argv (2)), false);
+               CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), false);
                return;
        }
 
        if (Q_strcasecmp(command, "loop") == 0)
        {
-               CDAudio_Play((byte)atoi(Cmd_Argv (2)), true);
+               CDAudio_Play((qbyte)atoi(Cmd_Argv (2)), true);
                return;
        }
 
@@ -337,13 +339,13 @@ void CDAudio_Update(void)
        {
                if (cdvolume)
                {
-                       Cvar_SetValue ("bgmvolume", 0.0);
+                       Cvar_SetValueQuick (&bgmvolume, 0.0);
                        cdvolume = bgmvolume.value;
                        CDAudio_Pause ();
                }
                else
                {
-                       Cvar_SetValue ("bgmvolume", 1.0);
+                       Cvar_SetValueQuick (&bgmvolume, 1.0);
                        cdvolume = bgmvolume.value;
                        CDAudio_Resume ();
                }
@@ -373,7 +375,7 @@ int CDAudio_Init(void)
        if (cls.state == ca_dedicated)
                return -1;
 
-       if (COM_CheckParm("-nocdaudio"))
+       if (COM_CheckParm("-nocdaudio") || COM_CheckParm("-safe"))
                return -1;
 
        if ((i = COM_CheckParm("-cddev")) != 0 && i < com_argc - 1) {
@@ -389,6 +391,7 @@ int CDAudio_Init(void)
 
        for (i = 0; i < 100; i++)
                remap[i] = i;
+       cdaudioinitialized = true;
        initialized = true;
        enabled = true;
 
@@ -414,3 +417,11 @@ void CDAudio_Shutdown(void)
        close(cdfile);
        cdfile = -1;
 }
+
+void CDAudio_Open(void)
+{
+}
+
+void CDAudio_Close(void)
+{
+}