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

Timestamp:

Apr 9, 2010, 11:08:21 PM (15 years ago)

Author:

pasha

Message:

remove beep call, remove all int3 for release versions

File:

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

OCO/trunk/drv16/mixer.cpp

@@ -71 +71 @@
 static int ALSAToIOCTL90Control[OSS32_MIX_MAX_CONTROLS] = {
 /* OSS32_MIX_VOLUME_MASTER_FRONT  */   -1,
-/* OSS32_MIX_VOLUME_MASTER_REAR   */   -1,
+/* OSS32_MIX_VOLUME_MASTER_REAR   */   -1,
 /* OSS32_MIX_VOLUME_PCM           */   STREAMVOLSET & 0xF,
-/* OSS32_MIX_VOLUME_MIDI              */   -1,
-/* OSS32_MIX_VOLUME_LINEIN            */   LINESET & 0xF,
-/* OSS32_MIX_VOLUME_MIC               */   MICSET & 0xF,
-/* OSS32_MIX_VOLUME_CD            */   CDSET & 0xF,
+/* OSS32_MIX_VOLUME_MIDI          */   -1,
+/* OSS32_MIX_VOLUME_LINEIN        */   LINESET & 0xF,
+/* OSS32_MIX_VOLUME_MIC           */   MICSET & 0xF,
+/* OSS32_MIX_VOLUME_CD            */   CDSET & 0xF,
 /* OSS32_MIX_VOLUME_SPDIF         */   -1,
 /* OSS32_MIX_VOLUME_VIDEO         */   VIDEOSET & 0xF,
-/* OSS32_MIX_VOLUME_SPEAKER           */   MONOINSET & 0xF,
-/* OSS32_MIX_VOLUME_PHONE             */   PHONESET & 0xF,
+/* OSS32_MIX_VOLUME_SPEAKER       */   MONOINSET & 0xF,
+/* OSS32_MIX_VOLUME_PHONE         */   PHONESET & 0xF,
 /* OSS32_MIX_VOLUME_HEADPHONE     */   -1, 
 /* OSS32_MIX_VOLUME_AUX           */   AUXSET & 0xF,
-/* OSS32_MIX_VOLUME_CAPTURE           */   RECORDGAINSET & 0xF,
+/* OSS32_MIX_VOLUME_CAPTURE       */   RECORDGAINSET & 0xF,
 /* none */                             -1,
 /* none */                             -1,
@@ -90 +90 @@
 /* none */                             -1,
 /* none */                             -1,
-/* OSS32_MIX_INPUTSRC                 */   RECORDSRCSET & 0xF,
+/* OSS32_MIX_INPUTSRC             */   RECORDSRCSET & 0xF,
 /* OSS32_MIX_LEVEL_BASS           */   BASSTREBLESET & 0xF,
 /* OSS32_MIX_LEVEL_TREBLE         */   BASSTREBLESET & 0xF,
@@ -191 +191 @@
             //  case I90SRC_RES6:
             default:
+                dprintf(("IoctlMixer: Unk VolL:%lx", (ULONG)pMixStruct->VolumeL));
                 break;
             }
@@ -302 +303 @@
 //   case MSGBUF:
     default:
+        dprintf(("IoctlMixer: bad code:%lx", (ULONG)prp->s.ioctl.bCode));
         prp->usStatus |= RPERR | RPBADCMD;
         return;