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

Timestamp:

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

Author:

sandervl

Message:

some cleanup

File:

• trunk/src/winmm/mixer.cpp (modified) (17 diffs)

trunk/src/winmm/mixer.cpp

@@ -1 @@
-/* $Id: mixer.cpp,v 1.25 2002-05-30 14:31:07 sandervl Exp $ */
+/* $Id: mixer.cpp,v 1.26 2002-07-12 08:12:29 sandervl Exp $ */
 
 /*
@@ -507 +507 @@
                                 return MIXERR_INVALCONTROL;
                             }
-                            return MMSYSERR_NOERROR;
+                            goto success;
                         }
                     }
@@ -538 +538 @@
             mixerControls[lpmcd->dwControlID].val[0].dwValue = dwVolumeL;
             mixerControls[lpmcd->dwControlID].val[1].dwValue = dwVolumeR;
-            return MMSYSERR_NOERROR;
+            goto success;
         }
 
@@ -559 +559 @@
             }
             mixerControls[lpmcd->dwControlID].val[0].dwValue = fMute;
-            return MMSYSERR_NOERROR;
+            goto success;
         }
 
@@ -588 +588 @@
             }
             mixerControls[lpmcd->dwControlID].val[0].dwValue = dwLevel;
-            return MMSYSERR_NOERROR;
+            goto success;
         }
         
@@ -678 +678 @@
     }
     return MMSYSERR_NOTSUPPORTED;
+
+success:
+    if(pMixInfo->dwFlags & CALLBACK_WINDOW && pMixInfo->dwCallback) {
+        dprintf(("Notify window %x of control change", pMixInfo->dwCallback));
+        PostMessageA((HWND)pMixInfo->dwCallback, MM_MIXM_CONTROL_CHANGE, (WPARAM)hmxobj, (LPARAM)lpmcd->dwControlID);
+    }
+    return MMSYSERR_NOERROR;
 }
 /******************************************************************************/
@@ -1528 +1535 @@
 /******************************************************************************/
 void mixerExit()
-{
+{ 
+    if(fMMPMAvailable == FALSE) return;
+
     OSLibMixerClose();
 }
@@ -1555 +1564 @@
     pline->Target.vDriverVersion = WINMM_MIXER_CAPS_VERSION;
     pline->dwSource              = nrSources;
+    OSLibMixGetLineCaps(dwSource, &pline->cChannels);
     nrSources++;
 
@@ -1562 +1572 @@
     case MIXER_SRC_IN_L_PHONE:
     case MIXER_SRC_IN_W_PHONE:
-        pline->cChannels       = 1;
         pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_TELEPHONE;
         pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
@@ -1569 +1578 @@
     case MIXER_SRC_IN_L_MIC:
     case MIXER_SRC_IN_W_MIC:
-        pline->cChannels       = 1;
         pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_MICROPHONE;
         pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
@@ -1576 +1584 @@
     case MIXER_SRC_IN_L_LINE:
     case MIXER_SRC_IN_W_LINE:
-        pline->cChannels       = 2;
         pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_LINE;
         pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
@@ -1583 +1590 @@
     case MIXER_SRC_IN_L_CD:
     case MIXER_SRC_IN_W_CD:
-        pline->cChannels       = 2;
         pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_COMPACTDISC;
         pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
@@ -1590 +1596 @@
     case MIXER_SRC_IN_L_SPDIF:
     case MIXER_SRC_IN_W_SPDIF:
-        pline->cChannels       = 2;
         pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_DIGITAL;
         pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
@@ -1597 +1602 @@
     case MIXER_SRC_IN_L_VIDEO:
     case MIXER_SRC_IN_W_VIDEO:
-        pline->cChannels       = 2;
         pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_UNDEFINED;
         pline->Target.dwType   = MIXERLINE_TARGETTYPE_UNDEFINED;
@@ -1604 +1608 @@
     case MIXER_SRC_IN_L_AUX:
     case MIXER_SRC_IN_W_AUX:
-        pline->cChannels       = 2;
         pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_AUXILIARY;
         pline->Target.dwType   = MIXERLINE_TARGETTYPE_AUX;
@@ -1611 +1614 @@
     case MIXER_SRC_IN_L_PCM:
     case MIXER_SRC_IN_W_PCM:
-        pline->cChannels       = 2;
         pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_WAVEOUT;
         pline->Target.dwType   = MIXERLINE_TARGETTYPE_WAVEOUT;
@@ -1620 +1622 @@
     case MIXER_SRC_IN_L_MIDI:
     case MIXER_SRC_IN_W_MIDI:
-        pline->cChannels       = 2;
         pline->dwComponentType = MIXERLINE_COMPONENTTYPE_SRC_SYNTHESIZER;
         pline->Target.dwType   = MIXERLINE_TARGETTYPE_MIDIOUT;