Changeset 64389 in vbox

Timestamp:

Oct 24, 2016 2:17:11 PM (8 years ago)

Author:

vboxsync

Message:

Audio/DevIchAc97.cpp: Check if mixer sink is available in ichac97MixerSetVolume() + ichac97StreamEnable().

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/DevIchAc97.cpp

@@ -568 +568 @@
 
     PAUDMIXSINK pSink = ichac97IndexToSink(pThis, pStream->u8Strm);
-    AssertPtr(pSink);
+    if (!pSink) /* No sink available (yet)? Bail out early. */
+        return VINF_SUCCESS;
 
     const bool fIsEnabled = AudioMixerSinkGetStatus(pSink) & AUDMIXSINK_STS_RUNNING;
@@ -1121 +1122 @@
     Log(("-> fMuted=%RTbool, lVol=%RU8, rVol=%RU8\n", fCntlMuted, lVol, rVol));
 
-    int rc;
+    int rc = VINF_SUCCESS;
 
     if (pThis->pMixer) /* Device can be in reset state, so no mixer available. */
     {
-        PDMAUDIOVOLUME Vol = { fCntlMuted, lVol, rVol };
+        PDMAUDIOVOLUME Vol   = { fCntlMuted, lVol, rVol };
+        PAUDMIXSINK    pSink = NULL;
+
         switch (enmMixerCtl)
         {
             case PDMAUDIOMIXERCTL_VOLUME_MASTER:
-                rc = AudioMixerSetMasterVolume(pThis->pMixer,    &Vol);
+                rc = AudioMixerSetMasterVolume(pThis->pMixer, &Vol);
                 break;
+
             case PDMAUDIOMIXERCTL_FRONT:
-                rc = AudioMixerSinkSetVolume(pThis->pSinkOut,    &Vol);
+                pSink = pThis->pSinkOut;
                 break;
 
             case PDMAUDIOMIXERCTL_MIC_IN:
-                rc = AudioMixerSinkSetVolume(pThis->pSinkMicIn,  &Vol);
+                pSink = pThis->pSinkMicIn;
                 break;
 
             case PDMAUDIOMIXERCTL_LINE_IN:
-                rc = AudioMixerSinkSetVolume(pThis->pSinkLineIn, &Vol);
+                pSink = pThis->pSinkLineIn;
                 break;
 
@@ -1148 +1152 @@
                 break;
         }
-    }
-    else
-        rc = VINF_SUCCESS;
+
+        if (pSink)
+            rc = AudioMixerSinkSetVolume(pSink, &Vol);
+    }
 
     ichac97MixerSet(pThis, index, uVal);
@@ -1942 +1947 @@
     PAC97BMREGS pRegs   = NULL;
 
-    PAUDMIXSINK pSink   = NULL;
-
     if (pStream)
     {
         pRegs = &pStream->Regs;
-        pSink = ichac97IndexToSink(pThis, pStream->u8Strm);
-        AssertPtr(pSink);
 
         int rc2 = RTCritSectEnter(&pStream->CritSect);