Changeset 88940 in vbox

Timestamp:

May 7, 2021 7:27:14 PM (4 years ago)

Author:

vboxsync

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

144275

Message:

Audio/Dev*: Must destroy the mixer in the destructor as the power off callback isn't always used. bugref:9890

Location:

trunk/src/VBox/Devices/Audio

Files:

• AudioMixer.cpp (modified) (1 diff)
• DevHda.cpp (modified) (1 diff)
• DevIchAc97.cpp (modified) (1 diff)
• DevSB16.cpp (modified) (1 diff)

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

@@ -793 +793 @@
         return;
 
+    /** @todo wrong critsect for audioMixerRemoveSinkInternal...   */
     int rc2 = RTCritSectEnter(&pSink->CritSect);
     AssertRC(rc2);

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

@@ -4665 +4665 @@
     for (uint8_t i = 0; i < HDA_MAX_STREAMS; i++)
         hdaR3StreamDestroy(&pThis->aStreams[i], &pThisCC->aStreams[i]);
+
+    /* We don't always go via PowerOff, so make sure the mixer is destroyed. */
+    if (pThisCC->pMixer)
+    {
+        AudioMixerDestroy(pThisCC->pMixer, pDevIns);
+        pThisCC->pMixer = NULL;
+    }
 
     DEVHDA_UNLOCK(pDevIns, pThis);

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

@@ -4069 +4069 @@
     Assert(RTListIsEmpty(&pThisCC->lstDrv));
 
+    /* We don't always go via PowerOff, so make sure the mixer is destroyed. */
+    if (pThisCC->pMixer)
+    {
+        AudioMixerDestroy(pThisCC->pMixer, pDevIns);
+        pThisCC->pMixer = NULL;
+    }
+
     return VINF_SUCCESS;
 }

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

@@ -3013 +3013 @@
         RTListNodeRemove(&pDrv->Node);
         RTMemFree(pDrv);
+    }
+
+    /* We don't always go via PowerOff, so make sure the mixer is destroyed. */
+    if (pThis->pMixer)
+    {
+        AudioMixerDestroy(pThis->pMixer, pDevIns);
+        pThis->pMixer = NULL;
     }