Changeset 8530 for trunk/src

Timestamp:

May 30, 2002, 4:31:07 PM (23 years ago)

Author:

sandervl

Message:

mixer fixes

Location:

trunk/src/winmm

Files:

• mixer.cpp (modified) (4 diffs)
• mixeros2.cpp (modified) (7 diffs)

trunk/src/winmm/mixer.cpp

@@ -1 @@
-/* $Id: mixer.cpp,v 1.24 2002-05-29 15:14:53 sandervl Exp $ */
+/* $Id: mixer.cpp,v 1.25 2002-05-30 14:31:07 sandervl Exp $ */
 
 /*
@@ -126 +126 @@
                 if(mixerDest[i].id == MIXER_DEST_WAVEIN) {
                     for(int j=0;j<mixerDest[i].cConnections;j++) {
-                        dprintf(("wavein source %d (id %d)", pmixerLines[mixerDest[i].Connections[j]]->id, mixerDest[i].Connections[j]));
+                        dprintf(("wavein source %s %d (id %d)", pmixerLines[mixerDest[i].Connections[j]]->line.szName, pmixerLines[mixerDest[i].Connections[j]]->id, mixerDest[i].Connections[j]));
                         if(pmixerLines[mixerDest[i].Connections[j]]->id == dwRecSrc) {
                             pDetails[j].fValue = 1;
@@ -351 +351 @@
                 if(mixerDest[i].id == MIXER_DEST_WAVEIN) {
                     for(int j=0;j<mixerDest[i].cConnections;j++) {
-                        dprintf(("wavein source %d (%s)", pmixerLines[mixerDest[i].Connections[j]]->id, pmixerLines[mixerDest[i].Connections[j]]->line.szName));
+                        dprintf(("wavein source %s %d (%s)", pmixerLines[mixerDest[i].Connections[j]]->line.szName, pmixerLines[mixerDest[i].Connections[j]]->id, pmixerLines[mixerDest[i].Connections[j]]->line.szName));
                         pDetails->dwParam1 = pmixerLines[mixerDest[i].Connections[j]]->line.dwLineID;
                         pDetails->dwParam2 = 0;
@@ -500 +500 @@
                 {
                     for(int j=0;j<mixerDest[i].cConnections;j++) {
-                        dprintf(("wavein source %d (id %d)", pmixerLines[mixerDest[i].Connections[j]]->id, mixerDest[i].Connections[j]));
+                        dprintf(("wavein source %s %d (id %d)", pmixerLines[mixerDest[i].Connections[j]]->line.szName, pmixerLines[mixerDest[i].Connections[j]]->id, mixerDest[i].Connections[j]));
                         if(pDetails[j].fValue) 
                         {

trunk/src/winmm/mixeros2.cpp

@@ -1 @@
-/* $Id: mixeros2.cpp,v 1.7 2002-05-28 17:10:02 sandervl Exp $ */
+/* $Id: mixeros2.cpp,v 1.8 2002-05-30 14:31:07 sandervl Exp $ */
 
 /*
@@ -81 +81 @@
         dprintf(("mciSendCommand returned error %x = %s", rc, szError));
     }
+
     return TRUE;
 }
@@ -88 +89 @@
 {
     if(hPDDMix) {
+        MIXSTRUCT mixstruct;
+        
+        //unlock recording source
+        if(mixerapiIOCTL90(hPDDMix, RECORDSRCQUERY, &mixstruct, sizeof(mixstruct)) == TRUE) {
+            mixstruct.Mute = 2;
+            if(mixerapiIOCTL90(hPDDMix, RECORDSRCSET, &mixstruct, sizeof(mixstruct)) == FALSE) {
+                dprintf(("OSLibMixerClose: mixerapiIOCTL90 RECORDSRCSET failed!!"));
+            }
+        }
+        else dprintf(("OSLibMixerClose: mixerapiIOCTL90 RECORDSRCQUERY failed!!"));
+
+        //unlock recording gain
+        if(mixerapiIOCTL90(hPDDMix, RECORDGAINQUERY, &mixstruct, sizeof(mixstruct)) == TRUE) {
+            mixstruct.Mute = 2;
+            if(mixerapiIOCTL90(hPDDMix, RECORDGAINSET, &mixstruct, sizeof(mixstruct)) == FALSE) {
+                dprintf(("OSLibMixerClose: mixerapiIOCTL90 RECORDGAINSET failed!!"));
+            }
+        }
+        else dprintf(("OSLibMixerClose: mixerapiIOCTL90 RECORDGAINQUERY failed!!"));
+
+        //unlock PCM volume
+        if(mixerapiIOCTL90(hPDDMix, STREAMVOLQUERY, &mixstruct, sizeof(mixstruct)) == TRUE) {
+            mixstruct.Mute = 2;
+            if(mixerapiIOCTL90(hPDDMix, STREAMVOLSET, &mixstruct, sizeof(mixstruct)) == FALSE) {
+                dprintf(("OSLibMixerClose: mixerapiIOCTL90 STREAMVOLSET failed!!"));
+            }
+        }
+        else dprintf(("OSLibMixerClose: mixerapiIOCTL90 STREAMVOLQUERY failed!!"));
+
         DosClose(hPDDMix);
     }
@@ -226 +256 @@
     }
 
-    dwIOCT90VolLeft  = WIN32_TO_IOCTL90_VOLUME(dwVolLeft);
+    dwIOCT90VolLeft  = WIN32_TO_IOCTL90_VOLUME(dwVolLeft);    
     dwIOCT90VolRight = WIN32_TO_IOCTL90_VOLUME(dwVolRight);
 
@@ -341 +371 @@
     }
     mixstruct.VolumeL = min(MIXER_IOCTL90_MAX_VOLUME, mixstruct.VolumeL);
-    mixstruct.VolumeR = min(MIXER_IOCTL90_MAX_VOLUME, mixstruct.VolumeR);
+    if(dwFunc == RECORDGAINSET) {
+         mixstruct.VolumeR = mixstruct.VolumeL; //only left is valid
+    }
+    else mixstruct.VolumeR = min(MIXER_IOCTL90_MAX_VOLUME, mixstruct.VolumeR);
 
     if(dwControl == MIX_CTRL_OUT_L_TREBLE) {
@@ -447 +480 @@
 BOOL OSLibMixIsRecSourcePresent(DWORD dwRecSrc)
 {
+    DWORD oldRecSrc;
+    BOOL  ret = TRUE;
+
+    OSLibMixGetRecSource(&oldRecSrc);
+
     if(OSLibMixSetRecSource(dwRecSrc) == FALSE) {
-        return FALSE;
-    }
-    return TRUE;
+        ret = FALSE;
+    }
+    OSLibMixSetRecSource(oldRecSrc);
+    return ret;
 }
 /******************************************************************************/
@@ -497 +536 @@
     }
 
-    dwVolL = szVolumeLevels[volidx][0];
-    dwVolR = szVolumeLevels[volidx][1];
-    mixstruct.VolumeL = WIN32_TO_IOCTL90_VOLUME(dwVolL);
-    mixstruct.VolumeR = WIN32_TO_IOCTL90_VOLUME(dwVolR);
-    mixstruct.Mute    = 0;
-
-    //set recording gain to that of the selected source
-    if(mixerapiIOCTL90(hPDDMix, RECORDGAINSET, &mixstruct, sizeof(mixstruct)) == FALSE) {
-        dprintf(("OSLibMixSetRecSource: mixerapiIOCTL90 RECORDGAINSET failed!!"));
-        return FALSE;
+    if(szVolumeLevels[volidx][0] != -1) 
+    {//if changed, override recording gain
+        dwVolL = szVolumeLevels[volidx][0];
+        dwVolR = szVolumeLevels[volidx][1];
+        mixstruct.VolumeL = WIN32_TO_IOCTL90_VOLUME(dwVolL);
+        mixstruct.VolumeR = WIN32_TO_IOCTL90_VOLUME(dwVolR);
+        mixstruct.Mute    = 0;
+
+        //set recording gain to that of the selected source
+        dprintf(("set recording gain to (%d,%d)", mixstruct.VolumeL, mixstruct.VolumeR));
+        if(mixerapiIOCTL90(hPDDMix, RECORDGAINSET, &mixstruct, sizeof(mixstruct)) == FALSE) {
+            dprintf(("OSLibMixSetRecSource: mixerapiIOCTL90 RECORDGAINSET failed!!"));
+            return FALSE;
+        }
     }
     return TRUE;