X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cd_linux.c;h=bc07b849f9febd274d719cdf36a2d3e7ca7699a5;hb=50f9c996dedd089ca65ae38bc2439ee67a189412;hp=7877e83f5b7131374d2188c7871b0aa4b28a0885;hpb=35f84fe46489e117fab33d2598921cd34ef0c759;p=xonotic%2Fdarkplaces.git

diff --git a/cd_linux.c b/cd_linux.c
index 7877e83f..bc07b849 100644
--- 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
+#include "quakedef.h"
+
 #include <linux/cdrom.h>
 #include <sys/ioctl.h>
 
@@ -28,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <time.h>
 #include <unistd.h>
 
-#include "quakedef.h"
+#include "cdaudio.h"
 
 
 static int cdfile = -1;
@@ -41,7 +44,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 +54,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 +66,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 +89,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;
 	}
 
@@ -101,13 +104,15 @@ void CDAudio_SysSetVolume (float volume)
 	if (cdfile == -1)
 		return;
 
-	vol.channel0 = vol.channel1 = volume * 255;
+	vol.channel0 = vol.channel1 = (__u8)(volume * 255);
+	vol.channel2 = vol.channel3 = 0;
+
 	if (ioctl (cdfile, CDROMVOLCTRL, &vol) == -1)
-		Con_DPrint("ioctl CDROMVOLCTRL failed\n");
+		Con_Print("ioctl CDROMVOLCTRL failed\n");
 }
 
 
-int CDAudio_SysPlay (qbyte track)
+int CDAudio_SysPlay (int track)
 {
 	struct cdrom_tocentry entry;
 	struct cdrom_ti ti;
@@ -120,7 +125,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)
@@ -139,13 +144,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;
 	}
 
@@ -160,7 +165,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;
 	}
 
@@ -174,7 +179,7 @@ int CDAudio_SysPause (void)
 
 	if (ioctl(cdfile, CDROMPAUSE) == -1)
 	{
-		Con_DPrint("ioctl CDROMPAUSE failed\n");
+		Con_Print("ioctl CDROMPAUSE failed\n");
 		return -1;
 	}
 
@@ -188,7 +193,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;
 }
@@ -198,13 +203,13 @@ int CDAudio_SysUpdate (void)
 	struct cdrom_subchnl subchnl;
 	static time_t lastchk = 0;
 
-	if (cdPlaying && lastchk < time(NULL))
+	if (cdPlaying && lastchk < time(NULL) && cdfile != -1)
 	{
 		lastchk = time(NULL) + 2; //two seconds between chks
 		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;
 		}
@@ -226,6 +231,7 @@ void CDAudio_SysInit (void)
 {
 	int i;
 
+// 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));
 }
@@ -234,7 +240,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;