X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=cd_bsd.c;h=7b3a855af4db44d1077a2847c16eea379eb99aa9;hb=212a93f6f5c06d50d331d61e1792d12f11ca1595;hp=5f4aa2b260f17a9149f7b040d86c5cd1ebf417cc;hpb=a2a8098c98290345b7f60dcc13710d6521a58d23;p=xonotic%2Fdarkplaces.git

diff --git a/cd_bsd.c b/cd_bsd.c
index 5f4aa2b2..7b3a855a 100644
--- a/cd_bsd.c
+++ b/cd_bsd.c
@@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software
 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.
+
+#include "quakedef.h"
 
 #include <sys/types.h>
 #include <sys/cdio.h>
@@ -28,13 +28,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <fcntl.h>
 #include <paths.h>
 #include <unistd.h>
-#include <util.h>
+#include <time.h>
+#ifndef __FreeBSD__
+# include <util.h>
+#endif
+
+#include "cdaudio.h"
 
-#include "quakedef.h"
 
+#ifndef __FreeBSD__
+# define DEFAULT_CD_DEVICE _PATH_DEV "cd0"
+#else
+# define DEFAULT_CD_DEVICE "/dev/acd0c"
+#endif
 
 static int cdfile = -1;
-static char cd_dev[64] = _PATH_DEV "cd0";
+static char cd_dev[64] = DEFAULT_CD_DEVICE;
 
 
 void CDAudio_SysEject (void)
@@ -44,7 +53,7 @@ void CDAudio_SysEject (void)
 
 	ioctl(cdfile, CDIOCALLOW);
 	if (ioctl(cdfile, CDIOCEJECT) == -1)
-		Con_DPrint("ioctl CDIOCEJECT failed\n");
+		Con_Print("ioctl CDIOCEJECT failed\n");
 }
 
 
@@ -55,7 +64,7 @@ void CDAudio_SysCloseDoor (void)
 
 	ioctl(cdfile, CDIOCALLOW);
 	if (ioctl(cdfile, CDIOCCLOSE) == -1)
-		Con_DPrint("ioctl CDIOCCLOSE failed\n");
+		Con_Print("ioctl CDIOCCLOSE failed\n");
 }
 
 int CDAudio_SysGetAudioDiskInfo (void)
@@ -67,13 +76,13 @@ int CDAudio_SysGetAudioDiskInfo (void)
 
 	if (ioctl(cdfile, CDIOREADTOCHEADER, &tochdr) == -1)
 	{
-		Con_DPrint("ioctl CDIOREADTOCHEADER failed\n");
+		Con_Print("ioctl CDIOREADTOCHEADER failed\n");
 		return -1;
 	}
 
 	if (tochdr.starting_track < 1)
 	{
-		Con_DPrint("CDAudio: no music tracks\n");
+		Con_Print("CDAudio: no music tracks\n");
 		return -1;
 	}
 
@@ -90,7 +99,7 @@ float CDAudio_SysGetVolume (void)
 
 	if (ioctl (cdfile, CDIOCGETVOL, &vol) == -1)
 	{
-		Con_DPrint("ioctl CDIOCGETVOL failed\n");
+		Con_Print("ioctl CDIOCGETVOL failed\n");
 		return -1.0f;
 	}
 
@@ -109,11 +118,11 @@ void CDAudio_SysSetVolume (float volume)
 	vol.vol[2] = vol.vol[3] = 0;
 
 	if (ioctl (cdfile, CDIOCSETVOL, &vol) == -1)
-		Con_DPrintf ("ioctl CDIOCSETVOL failed\n");
+		Con_Printf ("ioctl CDIOCSETVOL failed\n");
 }
 
 
-int CDAudio_SysPlay (qbyte track)
+int CDAudio_SysPlay (int track)
 {
 	struct ioc_read_toc_entry rte;
 	struct cd_toc_entry entry;
@@ -129,7 +138,7 @@ int CDAudio_SysPlay (qbyte track)
 	rte.data = &entry;
 	if (ioctl(cdfile, CDIOREADTOCENTRYS, &rte) == -1)
 	{
-		Con_DPrint("ioctl CDIOREADTOCENTRYS failed\n");
+		Con_Print("ioctl CDIOREADTOCENTRYS failed\n");
 		return -1;
 	}
 	if (entry.control & 4)  // if it's a data track
@@ -148,13 +157,13 @@ int CDAudio_SysPlay (qbyte track)
 
 	if (ioctl(cdfile, CDIOCPLAYTRACKS, &ti) == -1)
 	{
-		Con_DPrint("ioctl CDIOCPLAYTRACKS failed\n");
+		Con_Print("ioctl CDIOCPLAYTRACKS failed\n");
 		return -1;
 	}
 
 	if (ioctl(cdfile, CDIOCRESUME) == -1)
 	{
-		Con_DPrint("ioctl CDIOCRESUME failed\n");
+		Con_Print("ioctl CDIOCRESUME failed\n");
 		return -1;
 	}
 
@@ -169,7 +178,7 @@ int CDAudio_SysStop (void)
 
 	if (ioctl(cdfile, CDIOCSTOP) == -1)
 	{
-		Con_DPrintf("ioctl CDIOCSTOP failed (%d)\n", errno);
+		Con_Printf("ioctl CDIOCSTOP failed (%d)\n", errno);
 		return -1;
 	}
 	ioctl(cdfile, CDIOCALLOW);
@@ -184,7 +193,7 @@ int CDAudio_SysPause (void)
 
 	if (ioctl(cdfile, CDIOCPAUSE) == -1)
 	{
-		Con_DPrint("ioctl CDIOCPAUSE failed\n");
+		Con_Print("ioctl CDIOCPAUSE failed\n");
 		return -1;
 	}
 
@@ -198,7 +207,7 @@ int CDAudio_SysResume (void)
 		return -1;
 
 	if (ioctl(cdfile, CDIOCRESUME) == -1)
-		Con_DPrint("ioctl CDIOCRESUME failed\n");
+		Con_Print("ioctl CDIOCRESUME failed\n");
 
 	return 0;
 }
@@ -221,7 +230,7 @@ int CDAudio_SysUpdate (void)
 
 		if (ioctl(cdfile, CDIOCREADSUBCHANNEL, &subchnl) == -1)
 		{
-			Con_DPrint("ioctl CDIOCREADSUBCHANNEL failed\n");
+			Con_Print("ioctl CDIOCREADSUBCHANNEL failed\n");
 			cdPlaying = false;
 			return -1;
 		}
@@ -243,17 +252,22 @@ void CDAudio_SysInit (void)
 {
 	int i;
 
+// COMMANDLINEOPTION: BSD 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));
 }
 
 int CDAudio_SysStartup (void)
 {
+#ifndef __FreeBSD__
 	char buff [80];
 
 	if ((cdfile = opendisk(cd_dev, O_RDONLY, buff, sizeof(buff), 0)) == -1)
+#else
+	if ((cdfile = open(cd_dev, O_RDONLY)) < 0)
+#endif
 	{
-		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;