// 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>
#include <time.h>
#include <unistd.h>
-#include "quakedef.h"
#include "cdaudio.h"
return;
if (ioctl(cdfile, CDROMEJECT) == -1)
- Con_DPrint("ioctl CDROMEJECT failed\n");
+ Con_Print("ioctl CDROMEJECT failed\n");
}
return;
if (ioctl(cdfile, CDROMCLOSETRAY) == -1)
- Con_DPrint("ioctl CDROMCLOSETRAY failed\n");
+ Con_Print("ioctl CDROMCLOSETRAY failed\n");
}
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;
}
if (ioctl (cdfile, CDROMVOLREAD, &vol) == -1)
{
- Con_DPrint("ioctl CDROMVOLREAD failed\n");
+ Con_Print("ioctl CDROMVOLREAD failed\n");
return -1.0f;
}
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;
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)
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;
}
if (ioctl(cdfile, CDROMSTOP) == -1)
{
- Con_DPrintf("ioctl CDROMSTOP failed (%d)\n", errno);
+ Con_Printf("ioctl CDROMSTOP failed (%d)\n", errno);
return -1;
}
if (ioctl(cdfile, CDROMPAUSE) == -1)
{
- Con_DPrint("ioctl CDROMPAUSE failed\n");
+ Con_Print("ioctl CDROMPAUSE failed\n");
return -1;
}
return -1;
if (ioctl(cdfile, CDROMRESUME) == -1)
- Con_DPrint("ioctl CDROMRESUME failed\n");
+ Con_Print("ioctl CDROMRESUME failed\n");
return 0;
}
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;
}
{
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;