fix a logic bug in EntLight handling (should have been checking r_shadow_realtime_wor...

[xonotic/darkplaces.git] / cd_linux.c

diff --git a/cd_linux.c b/cd_linux.c
index 29a4bb062ad19279967b69dd766b3ee7a4b67d61..32c0c3f071963411fdb540b33575c7a26d3197a5 100644 (file)
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -34,13 +34,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 static int cdfile = -1;
 static char cd_dev[64] = "/dev/cdrom";
 
+
 void CDAudio_SysEject (void)
 {
        if (cdfile == -1)
                return;
 
        if (ioctl(cdfile, CDROMEJECT) == -1)
-               Con_DPrintf("ioctl cdromeject failed\n");
+               Con_DPrintf("ioctl CDROMEJECT failed\n");
 }
 
 
@@ -50,7 +51,7 @@ void CDAudio_SysCloseDoor (void)
                return;
 
        if (ioctl(cdfile, CDROMCLOSETRAY) == -1)
-               Con_DPrintf("ioctl cdromclosetray failed\n");
+               Con_DPrintf("ioctl CDROMCLOSETRAY failed\n");
 }
 
 int CDAudio_SysGetAudioDiskInfo (void)
@@ -59,7 +60,7 @@ int CDAudio_SysGetAudioDiskInfo (void)
 
        if (ioctl(cdfile, CDROMREADTOCHDR, &tochdr) == -1)
        {
-               Con_DPrintf("ioctl cdromreadtochdr failed\n");
+               Con_DPrintf("ioctl CDROMREADTOCHDR failed\n");
                return -1;
        }
 
@@ -86,7 +87,7 @@ int CDAudio_SysPlay (qbyte track)
        entry.cdte_format = CDROM_MSF;
        if (ioctl(cdfile, CDROMREADTOCENTRY, &entry) == -1)
        {
-               Con_DPrintf("ioctl cdromreadtocentry failed\n");
+               Con_DPrintf("ioctl CDROMREADTOCENTRY failed\n");
                return -1;
        }
        if (entry.cdte_ctrl == CDROM_DATA_TRACK)
@@ -105,13 +106,13 @@ int CDAudio_SysPlay (qbyte track)
 
        if (ioctl(cdfile, CDROMPLAYTRKIND, &ti) == -1)
        {
-               Con_DPrintf("ioctl cdromplaytrkind failed\n");
+               Con_DPrintf("ioctl CDROMPLAYTRKIND failed\n");
                return -1;
        }
 
        if (ioctl(cdfile, CDROMRESUME) == -1)
        {
-               Con_DPrintf("ioctl cdromresume failed\n");
+               Con_DPrintf("ioctl CDROMRESUME failed\n");
                return -1;
        }
 
@@ -126,10 +127,10 @@ int CDAudio_SysStop (void)
 
        if (ioctl(cdfile, CDROMSTOP) == -1)
        {
-               Con_DPrintf("ioctl cdromstop failed (%d)\n", errno);
+               Con_DPrintf("ioctl CDROMSTOP failed (%d)\n", errno);
                return -1;
        }
-       
+
        return 0;
 }
 
@@ -140,10 +141,10 @@ int CDAudio_SysPause (void)
 
        if (ioctl(cdfile, CDROMPAUSE) == -1)
        {
-               Con_DPrintf("ioctl cdrompause failed\n");
+               Con_DPrintf("ioctl CDROMPAUSE failed\n");
                return -1;
        }
-       
+
        return 0;
 }
 
@@ -154,7 +155,7 @@ int CDAudio_SysResume (void)
                return -1;
 
        if (ioctl(cdfile, CDROMRESUME) == -1)
-               Con_DPrintf("ioctl cdromresume failed\n");
+               Con_DPrintf("ioctl CDROMRESUME failed\n");
 
        return 0;
 }
@@ -164,22 +165,27 @@ int CDAudio_SysUpdate (void)
        struct cdrom_subchnl subchnl;
        static time_t lastchk = 0;
 
-       if (cdPlaying && lastchk < time(NULL)) {
+       if (cdPlaying && lastchk < time(NULL))
+       {
                lastchk = time(NULL) + 2; //two seconds between chks
                subchnl.cdsc_format = CDROM_MSF;
-               if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1 ) {
-                       Con_DPrintf("ioctl cdromsubchnl failed\n");
+               if (ioctl(cdfile, CDROMSUBCHNL, &subchnl) == -1)
+               {
+                       Con_DPrintf("ioctl CDROMSUBCHNL failed\n");
                        cdPlaying = false;
                        return -1;
                }
                if (subchnl.cdsc_audiostatus != CDROM_AUDIO_PLAY &&
-                       subchnl.cdsc_audiostatus != CDROM_AUDIO_PAUSED) {
+                       subchnl.cdsc_audiostatus != CDROM_AUDIO_PAUSED)
+               {
                        cdPlaying = false;
                        if (cdPlayLooping)
                                CDAudio_Play(cdPlayTrack, true);
                }
+               else
+                       cdPlayTrack = subchnl.cdsc_trk;
        }
-       
+
        return 0;
 }
 
@@ -188,14 +194,15 @@ void CDAudio_SysInit (void)
        int i;
 
        if ((i = COM_CheckParm("-cddev")) != 0 && i < com_argc - 1)
-               strlcpy (cd_dev, com_argv[i + 1], sizeof (cd_dev));
+               strlcpy(cd_dev, com_argv[i + 1], sizeof(cd_dev));
 }
 
 int CDAudio_SysStartup (void)
 {
        if ((cdfile = open(cd_dev, O_RDONLY)) == -1)
        {
-               Con_DPrintf("CDAudio_SysStartup: open of \"%s\" failed (%i)\n", cd_dev, errno);
+               Con_DPrintf("CDAudio_SysStartup: open of \"%s\" failed (%i)\n",
+                                       cd_dev, errno);
                cdfile = -1;
                return -1;
        }