Changeset 191 for sbliveos2/trunk/drv16/ioctl.cpp

Timestamp:

Sep 28, 2001, 2:10:07 PM (24 years ago)

Author:

sandervl

Message:

rudi's fixes + dac control added

File:

• sbliveos2/trunk/drv16/ioctl.cpp (modified) (6 diffs)

sbliveos2/trunk/drv16/ioctl.cpp

@@ -633 +633 @@
         OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETTREBLE, MAKE_VOLUME_LR(VolumeR, VolumeR));
         break;
-#if 0
+
     case STREAMVOLSET:
-        //release stream volume override?
-        if(pMixStruct->Mute == 2) {
-            fStreamVolIOCTL90 = FALSE;
-            break;
-        }
-        fStreamVolIOCTL90 = TRUE;
-        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETMASTERVOL, MAKE_VOLUME_LR(VolumeL, VolumeR));
-        break;
-#endif
+        OSS16_SetGlobalVol(prp->s.ioctl.usSysFileNum, MIX_SETPCMVOL, MAKE_VOLUME_LR(VolumeL, VolumeR));
+        break;
 
     case RECORDSRCSET:
@@ -697 +690 @@
     case RECORDSRCQUERY:
     case RECORDGAINQUERY:
+    case STREAMVOLQUERY:
         pMixStruct->VolumeL = MixerSettings[prp->s.ioctl.bCode & 0xF].VolumeL;
         pMixStruct->VolumeR = MixerSettings[prp->s.ioctl.bCode & 0xF].VolumeR;
@@ -727 +721 @@
         _fmemcpy(pIoctlMap, SBLiveIOCTLMap, sizeof(SBLiveIOCTLMap));
         break;
-//   case STREAMVOLQUERY:
+
 //   case MONOINSET:
 //   case PHONESET:
@@ -760 +754 @@
     SBLiveIOCTLMap[BASSTREBLESET]    = 1;
     SBLiveIOCTLMap[BASSTREBLEQUERY]  = 1;
-////    SBLiveIOCTLMap[STREAMVOLSET]     = 1;
-////    SBLiveIOCTLMap[STREAMVOLQUERY]   = 1;
+    SBLiveIOCTLMap[STREAMVOLSET]     = 1;
+    SBLiveIOCTLMap[STREAMVOLQUERY]   = 1;
     SBLiveIOCTLMap[RECORDSRCSET]     = 1;
     SBLiveIOCTLMap[RECORDSRCQUERY]   = 1;
@@ -791 +785 @@
     IoctlMixer(&rp);
 
-    //Set bass/treble
+   //Set aux
+    rp.s.ioctl.bCode  = AUXSET;
+    rp.s.ioctl.pvData = (void FAR *)&mixinfo;
+    mixinfo.Mute    = fAuxMute;
+    mixinfo.VolumeR = mixinfo.VolumeL = 80;
+    IoctlMixer(&rp);
+
+   //Set bass/treble
     rp.s.ioctl.bCode  = BASSTREBLESET;
     rp.s.ioctl.pvData = (void FAR *)&mixinfo;
@@ -812 +813 @@
     IoctlMixer(&rp);
 
-    //Set master volume
+    //Set PCM volume
     rp.s.ioctl.bCode  = STREAMVOLSET;
     rp.s.ioctl.pvData = (void FAR *)&mixinfo;
     mixinfo.Mute    = 0;
-    mixinfo.VolumeR = mixinfo.VolumeL = 90;
-    IoctlMixer(&rp);
-
-    //Release master volume override
-    rp.s.ioctl.bCode  = STREAMVOLSET;
-    rp.s.ioctl.pvData = (void FAR *)&mixinfo;
-    mixinfo.Mute    = 2;
     mixinfo.VolumeR = mixinfo.VolumeL = 90;
     IoctlMixer(&rp);