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

Timestamp:

Jul 12, 2002, 10:12:30 AM (23 years ago)

Author:

sandervl

Message:

some cleanup

File:

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

trunk/src/winmm/mixeros2.cpp

@@ -1 @@
-/* $Id: mixeros2.cpp,v 1.8 2002-05-30 14:31:07 sandervl Exp $ */
+/* $Id: mixeros2.cpp,v 1.9 2002-07-12 08:12:30 sandervl Exp $ */
 
 /*
@@ -44 +44 @@
     char szPDDName[128] = "\\DEV\\";
 
-    if(GetAudioPDDName(&szPDDName[5]) == FALSE) {
+    if(OSLibGetAudioPDDName(&szPDDName[5]) == FALSE) {
         return FALSE;
     }
@@ -317 +317 @@
     mixstruct.Mute = fMute;
 
+    dprintf(("OSLibMixSetMute (%d,%d) %d", mixstruct.VolumeL, mixstruct.VolumeR, mixstruct.Mute));
     if(mixerapiIOCTL90(hPDDMix, dwFunc, &mixstruct, sizeof(mixstruct)) == TRUE) {
         return TRUE;
     }
-    dprintf(("OSLibMixSetVolume: mixerapiIOCTL90 %d failed!!", dwFunc));
+    dprintf(("OSLibMixSetMute: mixerapiIOCTL90 %d failed!!", dwFunc));
     return FALSE;
 }
@@ -422 +423 @@
 /******************************************************************************/
 /******************************************************************************/
+BOOL OSLibMixGetLineCaps(DWORD dwLine, DWORD *pcChannels)
+{
+    switch(dwLine) {
+    case MIXER_SRC_IN_L_MONOIN:
+    case MIXER_SRC_IN_W_MONOIN:
+    case MIXER_SRC_IN_L_PHONE:
+    case MIXER_SRC_IN_W_PHONE:
+    case MIXER_SRC_IN_L_MIC:
+    case MIXER_SRC_IN_W_MIC:
+        *pcChannels = 1;
+        break;
+
+    case MIXER_SRC_IN_W_LINE:
+    case MIXER_SRC_IN_W_CD:
+    case MIXER_SRC_IN_W_SPDIF:
+    case MIXER_SRC_IN_W_VIDEO:
+    case MIXER_SRC_IN_W_AUX:
+    case MIXER_SRC_IN_W_PCM:
+    case MIXER_SRC_IN_W_WAVETABLE:
+    case MIXER_SRC_IN_W_MIDI:
+        *pcChannels = 2;
+        break;
+
+    case MIXER_SRC_IN_L_LINE:
+    case MIXER_SRC_IN_L_CD:
+    case MIXER_SRC_IN_L_SPDIF:
+    case MIXER_SRC_IN_L_VIDEO:
+    case MIXER_SRC_IN_L_AUX:
+    case MIXER_SRC_IN_L_PCM:
+    case MIXER_SRC_IN_L_WAVETABLE:
+    case MIXER_SRC_IN_L_MIDI:
+        *pcChannels = 2;
+        break;
+    default:
+        DebugInt3();
+        return FALSE;
+    }
+
+    return TRUE;
+}
+/******************************************************************************/
+/******************************************************************************/
 BOOL OSLibMixGetCtrlCaps(DWORD dwControl, LONG *plMinimum, LONG *plMaximum, DWORD *pcSteps)
 {
@@ -649 +692 @@
 // for the default MMPM/2 WaveAudio device.  Joe Nord 10-Mar-1999
 /******************************************************************************/
-static BOOL GetAudioPDDName (char *pszPDDName)
+BOOL OSLibGetAudioPDDName (char *pszPDDName)
 {
    ULONG                   ulRC;