made Cmd_ForwardToServer code far more readable and prevented forwarding an empty...

[xonotic/darkplaces.git] / cd_linux.c

diff --git a/cd_linux.c b/cd_linux.c
index c086eb8104bbdfaf293be46f56a42d52feec0fd5..6a64e4b590b37e4811767ccdcca8f86218cb1245 100644 (file)
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -20,6 +20,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // Quake is a trademark of Id Software, Inc., (c) 1996 Id Software, Inc. All
 // rights reserved.
 
+// suggested by Zero_Dogg to fix a compile problem on Mandriva Linux
+#define __KERNEL_STRICT_NAMES
+
 #include <linux/cdrom.h>
 #include <sys/ioctl.h>
 
@@ -29,6 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <unistd.h>
 
 #include "quakedef.h"
+#include "cdaudio.h"
 
 
 static int cdfile = -1;
@@ -41,7 +45,7 @@ void CDAudio_SysEject (void)
                return;
 
        if (ioctl(cdfile, CDROMEJECT) == -1)
-               Con_DPrint("ioctl CDROMEJECT failed\n");
+               Con_Print("ioctl CDROMEJECT failed\n");
 }
 
 
@@ -51,7 +55,7 @@ void CDAudio_SysCloseDoor (void)
                return;
 
        if (ioctl(cdfile, CDROMCLOSETRAY) == -1)
-               Con_DPrint("ioctl CDROMCLOSETRAY failed\n");
+               Con_Print("ioctl CDROMCLOSETRAY failed\n");
 }
 
 int CDAudio_SysGetAudioDiskInfo (void)
@@ -63,13 +67,13 @@ int CDAudio_SysGetAudioDiskInfo (void)
 
        if (ioctl(cdfile, CDROMREADTOCHDR, &tochdr) == -1)
        {
-               Con_DPrint("ioctl CDROMREADTOCHDR failed\n");
+               Con_Print("ioctl CDROMREADTOCHDR failed\n");
                return -1;
        }
 
        if (tochdr.cdth_trk0 < 1)
        {
-               Con_DPrint("CDAudio: no music tracks\n");
+               Con_Print("CDAudio: no music tracks\n");
                return -1;
        }
 
@@ -86,7 +90,7 @@ float CDAudio_SysGetVolume (void)
 
        if (ioctl (cdfile, CDROMVOLREAD, &vol) == -1)
        {
-               Con_DPrint("ioctl CDROMVOLREAD failed\n");
+               Con_Print("ioctl CDROMVOLREAD failed\n");
                return -1.0f;
        }
 
@@ -105,7 +109,7 @@ void CDAudio_SysSetVolume (float volume)
        vol.channel2 = vol.channel3 = 0;
 
        if (ioctl (cdfile, CDROMVOLCTRL, &vol) == -1)
-               Con_DPrint("ioctl CDROMVOLCTRL failed\n");
+               Con_Print("ioctl CDROMVOLCTRL failed\n");
 }
 
 
@@ -122,7 +126,7 @@ int CDAudio_SysPlay (qbyte track)
        entry.cdte_format = CDROM_MSF;
        if (ioctl(cdfile, CDROMREADTOCENTRY, &entry) == -1)
        {
-               Con_DPrint("ioctl CDROMREADTOCENTRY failed\n");
+               Con_Print("ioctl CDROMREADTOCENTRY failed\n");
                return -1;
        }
        if (entry.cdte_ctrl == CDROM_DATA_TRACK)
@@ -141,13 +145,13 @@ int CDAudio_SysPlay (qbyte track)
 
        if (ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1)
        {
-               Con_DPrint("ioctl CDROMPLAYTRKIND failed\n");
+               Con_Print("ioctl CDROMPLAYTRKIND failed\n");
                return -1;
        }
 
        if (ioctl(cdfile, CDROMRESUME) == -1)
        {
-               Con_DPrint("ioctl CDROMRESUME failed\n");
+               Con_Print("ioctl CDROMRESUME failed\n");
                return -1;
        }
 
@@ -162,7 +166,7 @@ int CDAudio_SysStop (void)
 
        if (ioctl(cdfile, CDROMSTOP) == -1)
        {
-               Con_DPrintf("ioctl CDROMSTOP failed (%d)\n", errno);
+               Con_Printf("ioctl CDROMSTOP failed (%d)\n", errno);
                return -1;
        }
 
@@ -176,7 +180,7 @@ int CDAudio_SysPause (void)
 
        if (ioctl(cdfile, CDROMPAUSE) == -1)
        {
-               Con_DPrint("ioctl CDROMPAUSE failed\n");
+               Con_Print("ioctl CDROMPAUSE failed\n");
                return -1;
        }
 
@@ -190,7 +194,7 @@ int CDAudio_SysResume (void)
                return -1;
 
        if (ioctl(cdfile, CDROMRESUME) == -1)
-               Con_DPrint("ioctl CDROMRESUME failed\n");
+               Con_Print("ioctl CDROMRESUME failed\n");
 
        return 0;
 }
@@ -206,7 +210,7 @@ int CDAudio_SysUpdate (void)
                subchnl.cdsc_format = CDROM_MSF;
                if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1)
                {
-                       Con_DPrint("ioctl CDROMSUBCHNL failed\n");
+                       Con_Print("ioctl CDROMSUBCHNL failed\n");
                        cdPlaying = false;
                        return -1;
                }
@@ -228,7 +232,7 @@ void CDAudio_SysInit (void)
 {
        int i;
 
-// COMMANDLINEOPTION: -cddev <devicepath> chooses which CD drive to use (bsd and Linux only)
+// COMMANDLINEOPTION: Linux Sound: -cddev <devicepath> chooses which CD drive to use
        if ((i = COM_CheckParm("-cddev")) != 0 && i < com_argc - 1)
                strlcpy(cd_dev, com_argv[i + 1], sizeof(cd_dev));
 }
@@ -237,7 +241,7 @@ int CDAudio_SysStartup (void)
 {
        if ((cdfile = open(cd_dev, O_RDONLY | O_NONBLOCK)) == -1)
        {
-               Con_DPrintf("CDAudio_SysStartup: open of \"%s\" failed (%i)\n",
+               Con_Printf("CDAudio_SysStartup: open of \"%s\" failed (%i)\n",
                                        cd_dev, errno);
                cdfile = -1;
                return -1;