Fine-grained CD volume for NetBSD. Made the CD error message "Bad track number" a...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4111 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cd_bsd.c b/cd_bsd.c
index 6c8f9a81aa89149ad39e210c9d50986f6bda668f..5f4aa2b260f17a9149f7b040d86c5cd1ebf417cc 100644 (file)
--- a/cd_bsd.c
+++ b/cd_bsd.c
@@ -83,14 +83,33 @@ int CDAudio_SysGetAudioDiskInfo (void)
 
 float CDAudio_SysGetVolume (void)
 {
-       // IMPLEMENTME
-       return -1.0f;
+       struct ioc_vol vol;
+
+       if (cdfile == -1)
+               return -1.0f;
+
+       if (ioctl (cdfile, CDIOCGETVOL, &vol) == -1)
+       {
+               Con_DPrint("ioctl CDIOCGETVOL failed\n");
+               return -1.0f;
+       }
+
+       return (vol.vol[0] + vol.vol[1]) / 2.0f / 255.0f;
 }
 
 
 void CDAudio_SysSetVolume (float volume)
 {
-       // IMPLEMENTME
+       struct ioc_vol vol;
+
+       if (cdfile == -1)
+               return;
+
+       vol.vol[0] = vol.vol[1] = volume * 255;
+       vol.vol[2] = vol.vol[3] = 0;
+
+       if (ioctl (cdfile, CDIOCSETVOL, &vol) == -1)
+               Con_DPrintf ("ioctl CDIOCSETVOL failed\n");
 }
 
 

diff --git a/cd_linux.c b/cd_linux.c
index 7877e83f5b7131374d2188c7871b0aa4b28a0885..9d4b447699c48eeeb3751d393e33660d10b6fe4c 100644 (file)
--- a/cd_linux.c
+++ b/cd_linux.c
@@ -102,6 +102,8 @@ void CDAudio_SysSetVolume (float volume)
                return;
 
        vol.channel0 = vol.channel1 = volume * 255;
+       vol.channel2 = vol.channel3 = 0;
+
        if (ioctl (cdfile, CDROMVOLCTRL, &vol) == -1)
                Con_DPrint("ioctl CDROMVOLCTRL failed\n");
 }

diff --git a/cd_shared.c b/cd_shared.c
index d1106c3701adab518d52025ba2f894034f64b059..bce1c14b4fa45769dfd8e7471b4674d1d97815d5 100644 (file)
--- a/cd_shared.c
+++ b/cd_shared.c
@@ -137,7 +137,7 @@ void CDAudio_Play (qbyte track, qboolean looping)
 
                if (track > maxTrack)
                {
-                       Con_DPrintf("CDAudio: Bad track number %u.\n", track);
+                       Con_Printf("CDAudio: Bad track number %u.\n", track);
                        return;
                }
 
@@ -380,7 +380,12 @@ int CDAudio_Startup (void)
 
        saved_vol = CDAudio_SysGetVolume ();
        if (saved_vol < 0.0f)
+       {
+               Con_DPrint ("Can't get initial CD volume\n");
                saved_vol = 1.0f;
+       }
+       else
+               Con_DPrintf ("Initial CD volume: %g\n", saved_vol);
 
        initialized = true;