Changeset 8477 for trunk/src/winmm/mixeros2.cpp

Timestamp:

May 23, 2002, 3:50:16 PM (23 years ago)

Author:

sandervl

Message:

mixer updates

File:

• trunk/src/winmm/mixeros2.cpp (modified) (5 diffs)

trunk/src/winmm/mixeros2.cpp

@@ -1 @@
-/* $Id: mixeros2.cpp,v 1.1 2002-05-22 20:19:11 sandervl Exp $ */
+/* $Id: mixeros2.cpp,v 1.2 2002-05-23 13:50:15 sandervl Exp $ */
 
 /*
@@ -73 +73 @@
 
     switch(dwControl) {
-    case MIXER_CTRL_MONOIN:
+    case MIX_CTRL_VOL_IN_L_MONO:
+    case MIX_CTRL_MUTE_IN_L_MONO:
         idx = MONOINSET;
         break;
-    case MIXER_CTRL_PHONE:
+    case MIX_CTRL_VOL_IN_L_PHONE:
+    case MIX_CTRL_MUTE_IN_L_PHONE:
         idx = PHONESET;
         break;
-    case MIXER_CTRL_MIC:
+    case MIX_CTRL_VOL_IN_L_MIC:
+    case MIX_CTRL_MUTE_IN_L_MIC:
         idx = MICSET;
         break;
-    case MIXER_CTRL_LINE:
+    case MIX_CTRL_VOL_IN_L_LINE:
+    case MIX_CTRL_MUTE_IN_L_LINE:
         idx = LINESET;
         break;
-    case MIXER_CTRL_CD:
+    case MIX_CTRL_VOL_IN_L_CD:
+    case MIX_CTRL_MUTE_IN_L_CD:
         idx = CDSET;
         break;
-    case MIXER_CTRL_VIDEO:
+    case MIX_CTRL_VOL_IN_L_VIDEO:
+    case MIX_CTRL_MUTE_IN_L_VIDEO:
         idx = VIDEOSET;
         break;
-    case MIXER_CTRL_AUX:
+    case MIX_CTRL_VOL_IN_L_AUX:
+    case MIX_CTRL_MUTE_IN_L_AUX:
         idx = AUXSET;
         break;
-    case MIXER_CTRL_BASS:
+    case MIX_CTRL_OUT_L_BASS:
+    case MIX_CTRL_OUT_L_TREBLE:
         idx = BASSTREBLESET;
         break;
-    case MIXER_CTRL_TREBLE:
-        idx = BASSTREBLESET;
-        break;
-    case MIXER_CTRL_3D:
+    case MIX_CTRL_OUT_L_3DCENTER:
+    case MIX_CTRL_OUT_L_3DDEPTH:
         idx = THREEDSET;
         break;
-    case MIXER_CTRL_STREAMVOL:
+    case MIX_CTRL_VOL_IN_L_PCM:
+    case MIX_CTRL_MUTE_IN_L_PCM:
         idx = STREAMVOLSET;
         break;
-    case MIXER_CTRL_RECORDSRC:
+    case MIX_CTRL_MUX_IN_W_SRC:
         idx = RECORDSRCSET;
         break;
-    case MIXER_CTRL_RECORDGAIN:
-        idx = RECORDGAINSET;
-        break;
     default:
-        DebugInt3();
         return -1;
     }
@@ -188 +191 @@
 /******************************************************************************/
 /******************************************************************************/
-BOOL OSLibMixSetRecSource(DWORD dwRecSrc)
+BOOL OSLibMixIsRecSourcePresent(DWORD dwRecSrc)
+{
+    DWORD dwOldRecSrc, dwVolL, dwVolR;
+
+    if(OSLibMixGetRecSource(&dwOldRecSrc, &dwVolL, &dwVolR) == FALSE) {
+        return FALSE;
+    }
+    if(OSLibMixSetRecSource(dwRecSrc, dwVolL, dwVolR) == FALSE) {
+        return FALSE;
+    }
+    OSLibMixSetRecSource(dwOldRecSrc, dwVolL, dwVolR);
+    return TRUE;
+}
+/******************************************************************************/
+/******************************************************************************/
+BOOL OSLibMixSetRecSource(DWORD dwRecSrc, DWORD dwVolL, DWORD dwVolR)
 {
     DWORD idx;
@@ -194 +212 @@
 
     switch(dwRecSrc) {
-    case MIXER_RECSRC_MIC:
+    case MIX_CTRL_VOL_IN_W_MIC:
         idx = I90SRC_MIC;
         break;
-    case MIXER_RECSRC_CD:
+    case MIX_CTRL_VOL_IN_W_CD:
         idx = I90SRC_CD;
         break;
-    case MIXER_RECSRC_VIDEO:
+    case MIX_CTRL_VOL_IN_W_VIDEO:
         idx = I90SRC_VIDEO;
         break;
-    case MIXER_RECSRC_AUX:
+    case MIX_CTRL_VOL_IN_W_AUX:
         idx = I90SRC_AUX;
         break;
-    case MIXER_RECSRC_LINE:
+    case MIX_CTRL_VOL_IN_W_LINE:
         idx = I90SRC_LINE;
         break;
-    case MIXER_RECSRC_RES5:
-        idx = I90SRC_RES5;
-        break;
-    case MIXER_RECSRC_RES6:
-        idx = I90SRC_RES6;
-        break;
-    case MIXER_RECSRC_PHONE:
+    case MIX_CTRL_VOL_IN_W_PHONE:
         idx = I90SRC_PHONE;
+        break;
+    default:
+        return FALSE;
+    }
+    mixstruct.Mute    = 0;
+    mixstruct.VolumeL = idx;
+
+    if(mixerapiIOCTL90(hPDDMix, RECORDSRCSET, &mixstruct, sizeof(mixstruct)) == FALSE) {
+        dprintf(("OSLibMixSetRecSource: mixerapiIOCTL90 RECORDSRCSET failed!!"));
+        return FALSE;
+    }
+
+    mixstruct.Mute    = 0;
+    mixstruct.VolumeL = dwVolL;
+    mixstruct.VolumeR = dwVolR;
+    if(mixerapiIOCTL90(hPDDMix, RECORDGAINSET, &mixstruct, sizeof(mixstruct)) == FALSE) {
+        dprintf(("OSLibMixSetRecSource: mixerapiIOCTL90 RECORDGAINSET failed!!"));
+        return FALSE;
+    }
+    return TRUE;
+}
+/******************************************************************************/
+/******************************************************************************/
+BOOL OSLibMixGetRecSource(DWORD *pdwRecSrc, DWORD *pdwVolL, DWORD *pdwVolR)
+{
+    DWORD idx;
+    MIXSTRUCT mixstruct;
+
+    if(mixerapiIOCTL90(hPDDMix, RECORDSRCQUERY, &mixstruct, sizeof(mixstruct)) == FALSE) {
+        dprintf(("OSLibMixSetRecSource: mixerapiIOCTL90 RECORDSRCGET failed!!"));
+        return FALSE;
+    }
+    switch(mixstruct.VolumeL) {
+    case I90SRC_MIC:
+        idx = MIX_CTRL_VOL_IN_W_MIC;
+        break;
+    case I90SRC_CD:
+        idx = MIX_CTRL_VOL_IN_W_CD;
+        break;
+    case I90SRC_VIDEO:
+        idx = MIX_CTRL_VOL_IN_W_VIDEO;
+        break;
+    case I90SRC_AUX:
+        idx = MIX_CTRL_VOL_IN_W_AUX;
+        break;
+    case I90SRC_LINE:
+        idx = MIX_CTRL_VOL_IN_W_LINE;
+        break;
+    case I90SRC_PHONE:
+        idx = MIX_CTRL_VOL_IN_W_PHONE;
         break;
     default:
@@ -222 +284 @@
         return FALSE;
     }
-    mixstruct.Mute    = 0;
-    mixstruct.VolumeL = idx;
-
-    if(mixerapiIOCTL90(hPDDMix, RECORDSRCSET, &mixstruct, sizeof(mixstruct)) == TRUE) {
-        return TRUE;
-    }
-    dprintf(("OSLibMixSetRecSource: mixerapiIOCTL90 RECORDSRCSET failed!!"));
-    return FALSE;
-}
-/******************************************************************************/
-/******************************************************************************/
-BOOL OSLibMixGetRecSource(DWORD *pdwRecSrc)
-{
-    DWORD idx;
-    MIXSTRUCT mixstruct;
-
-    if(mixerapiIOCTL90(hPDDMix, RECORDSRCQUERY, &mixstruct, sizeof(mixstruct)) == FALSE) {
-        dprintf(("OSLibMixSetRecSource: mixerapiIOCTL90 RECORDSRCGET failed!!"));
-        return FALSE;
-    }
-    switch(mixstruct.VolumeL) {
-    case I90SRC_MIC:
-        idx = MIXER_RECSRC_MIC;
-        break;
-    case I90SRC_CD:
-        idx = MIXER_RECSRC_CD;
-        break;
-    case I90SRC_VIDEO:
-        idx = MIXER_RECSRC_VIDEO;
-        break;
-    case I90SRC_AUX:
-        idx = MIXER_RECSRC_AUX;
-        break;
-    case I90SRC_LINE:
-        idx = MIXER_RECSRC_LINE;
-        break;
-    case I90SRC_RES5:
-        idx = MIXER_RECSRC_RES5;
-        break;
-    case I90SRC_RES6:
-        idx = MIXER_RECSRC_RES6;
-        break;
-    case I90SRC_PHONE:
-        idx = MIXER_RECSRC_PHONE;
-        break;
-    default:
-        DebugInt3();
-        return FALSE;
-    }
     if(pdwRecSrc) {
         *pdwRecSrc = idx;
+    }
+    if(mixerapiIOCTL90(hPDDMix, RECORDGAINQUERY, &mixstruct, sizeof(mixstruct)) == FALSE) {
+        dprintf(("OSLibMixSetRecSource: mixerapiIOCTL90 RECORDGAINQUERY failed!!"));
+        return FALSE;
+    }
+    if(pdwVolL) {
+        *pdwVolL = mixstruct.VolumeL;
+    }
+    if(pdwVolR) {
+        *pdwVolR = mixstruct.VolumeR;
     }
     return TRUE;