Changeset 483 for OCO/trunk/drv16/mixer.cpp

Timestamp:

May 6, 2010, 3:08:34 AM (15 years ago)

Author:

David Azarewicz

Message:

Rework buffer management

File:

• OCO/trunk/drv16/mixer.cpp (modified) (20 diffs)

OCO/trunk/drv16/mixer.cpp

@@ -81 +81 @@
 /* OSS32_MIX_VOLUME_SPEAKER       */   MONOINSET & 0xF,
 /* OSS32_MIX_VOLUME_PHONE         */   PHONESET & 0xF,
-/* OSS32_MIX_VOLUME_HEADPHONE     */   -1, 
+/* OSS32_MIX_VOLUME_HEADPHONE     */   -1,
 /* OSS32_MIX_VOLUME_AUX           */   AUXSET & 0xF,
 /* OSS32_MIX_VOLUME_CAPTURE       */   RECORDGAINSET & 0xF,
@@ -109 +109 @@
     USHORT    VolumeL, VolumeR;
 
+    //dprintf(("IoctlMixer Dev=%x Code=%x Data=%x", LDev, prp->s.ioctl.bCode, prp->s.ioctl.pvData));
     if((prp->s.ioctl.bCode & 0xF0) == 0x40)
     {
@@ -123 +124 @@
         if(prp->s.ioctl.bCode == RECORDSRCSET ||
            prp->s.ioctl.bCode == RECORDGAINSET ||
-           prp->s.ioctl.bCode == STREAMVOLSET) 
+           prp->s.ioctl.bCode == STREAMVOLSET)
         {
              if(pMixStruct->Mute != 2) { //don't save lock override value
@@ -149 +150 @@
     }
 
-    if(prp->s.ioctl.bCode >= MONOINSET && prp->s.ioctl.bCode <= RECORDGAINSET) 
+    if(prp->s.ioctl.bCode >= MONOINSET && prp->s.ioctl.bCode <= RECORDGAINSET)
     {
         int idx = prp->s.ioctl.bCode & 0xF;
@@ -198 +199 @@
                 break;
             }
-            MixerSetProperty(MixerStreamId, OSS32_MIX_INPUTSRC, recsrc, 
+            MixerSetProperty(MixerStreamId, OSS32_MIX_INPUTSRC, recsrc,
                              MIXFLAG_FORCE_UPDATE|MIXFLAG_IOCTL90);
             break;
@@ -210 +211 @@
             fRecGainIOCTL90 = TRUE;
             //must use left volume value only
-            MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_CAPTURE, MAKE_VOLUME_LR(VolumeL, VolumeL), 
+            MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_CAPTURE, MAKE_VOLUME_LR(VolumeL, VolumeL),
                            MIXFLAG_FORCE_UPDATE|MIXFLAG_IOCTL90);
             break;
@@ -223 +224 @@
 
             fPCMVolIOCTL90 = TRUE;
-            MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_PCM, MAKE_VOLUME_LR(VolumeL, VolumeR), 
+            MixerSetVolume(MixerStreamId, OSS32_MIX_VOLUME_PCM, MAKE_VOLUME_LR(VolumeL, VolumeR),
                            MIXFLAG_FORCE_UPDATE|MIXFLAG_IOCTL90);
             break;
@@ -233 +234 @@
         }
     }
-    else 
-    if(prp->s.ioctl.bCode >= MONOINQUERY && prp->s.ioctl.bCode <= RECORDGAINQUERY) 
+    else
+    if(prp->s.ioctl.bCode >= MONOINQUERY && prp->s.ioctl.bCode <= RECORDGAINQUERY)
      {
         int idx = prp->s.ioctl.bCode & 0xF;
@@ -289 +290 @@
                 return;
             }
-        }        
-        else 
+        }
+        else
         if(oldsem) {
             if(DevHelp_CloseEventSem(oldsem) != 0) {
@@ -333 +334 @@
 
     //if input gain is not supported by hardware, then change line volume
-    if(ulControl == OSS32_MIX_VOLUME_CAPTURE && !(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_CAPTURE))) 
+    if(ulControl == OSS32_MIX_VOLUME_CAPTURE && !(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_CAPTURE)))
     {
         dprintf(("MixerSetVolume: No input gain -> change line volume!!"));
@@ -359 +360 @@
     }
 
-    if(!(fFlags & MIXFLAG_DONTSAVE)) 
-    {
-        if(ulControl < OSS32_MIX_MAX_CONTROLS && ALSAToIOCTL90Control[ulControl] != -1) 
+    if(!(fFlags & MIXFLAG_DONTSAVE))
+    {
+        if(ulControl < OSS32_MIX_MAX_CONTROLS && ALSAToIOCTL90Control[ulControl] != -1)
         {
             int idx = ALSAToIOCTL90Control[ulControl];
@@ -409 +410 @@
     }
 
-    if(ulControl < OSS32_MIX_MAX_CONTROLS && (mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(ulControl))) 
-    {
-        ulVolume = MAKE_VOLUME_LR(MixerSettingsALSA[ulControl].VolumeL, 
+    if(ulControl < OSS32_MIX_MAX_CONTROLS && (mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(ulControl)))
+    {
+        ulVolume = MAKE_VOLUME_LR(MixerSettingsALSA[ulControl].VolumeL,
                                   MixerSettingsALSA[ulControl].VolumeR);
     }
@@ -424 +425 @@
     ULONG ulVolume = 0;
 
-    if(ulControl < OSS32_MIX_MAX_CONTROLS && (mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(ulControl))) 
-    {
-        ulVolume = MAKE_VOLUME_LR(MixerSettingsALSA[ulControl].VolumeL, 
+    if(ulControl < OSS32_MIX_MAX_CONTROLS && (mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(ulControl)))
+    {
+        ulVolume = MAKE_VOLUME_LR(MixerSettingsALSA[ulControl].VolumeL,
                                   MixerSettingsALSA[ulControl].VolumeR);
     }
@@ -435 +436 @@
 //******************************************************************************
 void DBGCALLCONV MixerSuspend()
-{ 
+{
     ULONG ulVolume;
     int i;
 
-    dprintf(("MixerSuspend"));
+        //dprintf(("MixerSuspend"));
 
     for(i=0;i<=OSS32_MIX_VOLUME_MAX;i++) {
@@ -470 +471 @@
     int i;
 
-    dprintf(("MixerRestoreState"));
+        //dprintf(("MixerRestoreState"));
 
     //restore mixer control volume
@@ -586 +587 @@
 
     if(hMixerNotifySem) {
-        dprintf(("Notify mixer change"));
+                //dprintf(("Notify mixer change"));
         rc = DevHelp_PostEventSem(hMixerNotifySem);
         if(rc != 0) {
@@ -611 +612 @@
     USHORT lVolume, rVolume;
 
-    if(OSS16_MixOpen(LDev, &MixerStreamId) != OSSERR_SUCCESS) 
+    if(OSS16_MixOpen(LDev, &MixerStreamId) != OSSERR_SUCCESS)
     {
         DebugInt3();
@@ -617 +618 @@
         return;
     }
-    if(OSS16_MixQueryCaps(MixerStreamId, &mixcaps) != OSSERR_SUCCESS) 
+    if(OSS16_MixQueryCaps(MixerStreamId, &mixcaps) != OSSERR_SUCCESS)
     {
         DebugInt3();
@@ -685 +686 @@
         ALSAIOCTLMap[VIDEOSET]         = 1;
         ALSAIOCTLMap[VIDEOQUERY]       = 1;
-    
+
         //Set VIDEO
         rp.s.ioctl.bCode  = VIDEOSET;
@@ -702 +703 @@
         mixinfo.Mute    = 1;
         mixinfo.VolumeR = mixinfo.VolumeL = 80;
-        IoctlMixer(&rp, LDev);    
+        IoctlMixer(&rp, LDev);
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_PHONE)) {