Changeset 61417 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Jun 2, 2016 4:16:21 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

107734

Message:

Audio/DevIchHda.cpp: Saved state fixes.

File:

• trunk/src/VBox/Devices/Audio/DevIchHda.cpp (modified) (3 diffs)

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

@@ -1751 +1751 @@
 }
 
-static int hdaStreamSetActive(PHDASTATE pThis, PHDASTREAM pStream, bool fActive)
+static bool hdaStreamIsActive(PHDASTATE pThis, PHDASTREAM pStream)
 {
     AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
     AssertPtrReturn(pStream, VERR_INVALID_POINTER);
 
+    bool fActive = false;
+
+    AssertPtr(pStream->pMixSink);
+    if (pStream->pMixSink->pMixSink)
+        fActive = AudioMixerSinkHasData(pStream->pMixSink->pMixSink);
+
+    LogFlowFunc(("SD=%RU8, fActive=%RTbool\n", pStream->u8SD, fActive));
+    return fActive;
+}
+
+static int hdaStreamSetActive(PHDASTATE pThis, PHDASTREAM pStream, bool fActive)
+{
+    AssertPtrReturn(pThis,   VERR_INVALID_POINTER);
+    AssertPtrReturn(pStream, VERR_INVALID_POINTER);
+
+    if (!pStream->pMixSink) /* No mixer sink assigned? Bail out early. */
+    {
+        LogFlowFunc(("u8Strm=%RU8 has no mixer sink assigned\n", pStream->u8SD));
+        return VINF_SUCCESS;
+    }
+
     AUDMIXSINKCMD enmCmd = fActive
                          ? AUDMIXSINKCMD_ENABLE : AUDMIXSINKCMD_DISABLE;
 
     /* First, enable or disable the stream's sink, if any. */
-    AssertPtr(pStream->pMixSink);
     if (pStream->pMixSink->pMixSink)
         AudioMixerSinkCtl(pStream->pMixSink->pMixSink, enmCmd);
@@ -1783 +1803 @@
 
     LogFlowFunc(("u8Strm=%RU8, fActive=%RTbool, cStreamsActive=%RU8\n", pStream->u8SD, fActive, pThis->cStreamsActive));
-
     return VINF_SUCCESS;
 }
@@ -3943 +3962 @@
         Assert(uSD < HDA_MAX_STREAMS);
 
-        PHDASTREAM pStream = hdaStreamFromSD(pThis, pSink->uSD);
+        PHDASTREAM pStream = hdaStreamFromSD(pThis, uSD);
         if (pStream)
         {