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

Timestamp:

Jul 22, 2010, 9:33:17 PM (15 years ago)

Author:

David Azarewicz

Message:

Reintegrate branch into trunk

File:

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

OCO/trunk/drv16/mixer.cpp

@@ -116 +116 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pMixStruct), sizeof(MIXSTRUCT), OFFSETOF(pMixStruct), VERIFY_READWRITE))
         {
-            dprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
+            rprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -144 +144 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pMixStruct), sizeof(MIXSTRUCT), OFFSETOF(pMixStruct), VERIFY_READONLY))
         {
-            dprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
+            rprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -192 +192 @@
             //  case I90SRC_RES6:
             default:
-                dprintf(("IoctlMixer: Unk VolL:%lx", (ULONG)pMixStruct->VolumeL));
+                rprintf(("IoctlMixer: Unk VolL:%lx", (ULONG)pMixStruct->VolumeL));
                 break;
             }
@@ -253 +253 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pIoctlData), sizeof(ULONG), OFFSETOF(pIoctlData), VERIFY_READWRITE))
         {
-            dprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pIoctlData));
+            rprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pIoctlData));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -263 +263 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pIoctlMap), sizeof(ALSAIOCTLMap), OFFSETOF(pIoctlMap), VERIFY_READWRITE))
         {
-            dprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
+            rprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pMixStruct));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -277 +277 @@
         if(DevHelp_VerifyAccess(SELECTOROF(pIoctlData), sizeof(ULONG), OFFSETOF(pIoctlData), VERIFY_READONLY))
         {
-            dprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pIoctlData));
+            rprintf(("Invalid IOCTL90 pointer %lx!!", (ULONG)pIoctlData));
             prp->usStatus |= RPERR | RPBADCMD;
             return;
@@ -286 +286 @@
         if(hMixerNotifySem != 0) {
             if(DevHelp_OpenEventSem(hMixerNotifySem) != 0) {
-                dprintf(("CALLBACKREG: DevHlp_OpenEventSem %lx failed!", hMixerNotifySem));
+                rprintf(("CALLBACKREG: DevHlp_OpenEventSem %lx failed!", hMixerNotifySem));
                 prp->usStatus |= RPERR | RPBADCMD;
                 return;
@@ -294 +294 @@
         if(oldsem) {
             if(DevHelp_CloseEventSem(oldsem) != 0) {
-                dprintf(("CALLBACKREG: DevHlp_OpenEventSem %lx failed!", oldsem));
+                rprintf(("CALLBACKREG: DevHlp_OpenEventSem %lx failed!", oldsem));
                 prp->usStatus |= RPERR | RPBADCMD;
                 return;
@@ -304 +304 @@
 //   case MSGBUF:
     default:
-        dprintf(("IoctlMixer: bad code:%lx", (ULONG)prp->s.ioctl.bCode));
+        rprintf(("IoctlMixer: bad code:%lx", (ULONG)prp->s.ioctl.bCode));
         prp->usStatus |= RPERR | RPBADCMD;
         return;
@@ -317 +317 @@
         fSetWaveVolume = FALSE;
         //if per-stream volume not supported, change PCM volume instead
+        //dprintf(("Setting PCM volume instead"));
         return MixerSetVolume(mixerStreamId, OSS32_MIX_VOLUME_PCM, Volume, fFlags);
     }
@@ -358 +359 @@
 
     if(OSS16_MixSetVolume(mixerStreamId, (USHORT)ulControl, ulVolume) != OSSERR_SUCCESS) {
-        dprintf(("MixerSetVolume: OSS16_MixSetVolume failed!!"));
+        rprintf(("MixerSetVolume: OSS16_MixSetVolume failed!!"));
         return FALSE;
     }
@@ -506 +507 @@
 
     if(OSS16_MixSetProperty(mixerStreamId, (USHORT)ulControl, ulALSAValue) != OSSERR_SUCCESS) {
-        dprintf(("MixerSetProperty: OSS16_MixSetProperty failed!!"));
+        rprintf(("MixerSetProperty: OSS16_MixSetProperty failed!!"));
         return FALSE;
     }
@@ -592 +593 @@
         rc = DevHelp_PostEventSem(hMixerNotifySem);
         if(rc != 0) {
-            dprintf(("MixerNotifyChange: DevHlp_PostEventSem returned %d", rc));
+            rprintf(("MixerNotifyChange: DevHlp_PostEventSem returned %d", rc));
         }
         rc = DevHelp_VirtToLin(SELECTOROF(pNumPosts), OFFSETOF(pNumPosts), &linaddr);
@@ -602 +603 @@
         rc = DevHelp_ResetEventSem(hMixerNotifySem, linaddr);
         if(rc != 0) {
-            dprintf(("MixerNotifyChange: DevHelp_ResetEventSem returned %d", rc));
+            rprintf(("MixerNotifyChange: DevHelp_ResetEventSem returned %d", rc));
         }
     }
@@ -651 +652 @@
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_MIDI)) {
-                dprintf(("MixerInit: MIX_VOLUME_MIDI not processed"));
+                rprintf(("MixerInit: MIX_VOLUME_MIDI not processed"));
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_LINEIN)) {
@@ -729 +730 @@
         mixinfo.VolumeR = mixinfo.VolumeL = 80;
         IoctlMixer(&rp, LDev);
-//              dprintf(("MixerInit: MIX_VOLUME_HEADPHONE not processed"));
+                //dprintf(("MixerInit: MIX_VOLUME_HEADPHONE not processed"));
     }
     if(mixcaps.fuCtrlCaps & OSS32_MIX_FLAG(OSS32_MIX_VOLUME_AUX)) {