Changeset 88762 in vbox for trunk/src/VBox/Devices/Audio/DrvAudio.cpp

Timestamp:

Apr 29, 2021 1:20:46 AM (4 years ago)

Author:

vboxsync

Message:

Audio: Do not pause disabled streams as that may cause some simplistic backends (like ALSA) to enable the stream upon resume. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvAudio.cpp (modified) (5 diffs)

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

@@ -1978 +1978 @@
     {
         case PDMAUDIOSTREAMCMD_ENABLE:
-        {
             if (!(pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_ENABLED))
             {
@@ -2012 +2011 @@
             }
             break;
-        }
 
         case PDMAUDIOSTREAMCMD_DISABLE:
-        {
             if (pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_ENABLED)
             {
@@ -2051 +2048 @@
             }
             break;
-        }
 
         case PDMAUDIOSTREAMCMD_PAUSE:
-        {
-            if (!(pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_PAUSED))
+            if (   (pStreamEx->Core.fStatus & (PDMAUDIOSTREAM_STS_ENABLED | PDMAUDIOSTREAM_STS_PAUSED))
+                ==                             PDMAUDIOSTREAM_STS_ENABLED)
             {
                 rc = drvAudioStreamControlInternalBackend(pThis, pStreamEx, PDMAUDIOSTREAMCMD_PAUSE);
@@ -2065 +2061 @@
             }
             break;
-        }
 
         case PDMAUDIOSTREAMCMD_RESUME:
-        {
             if (pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_PAUSED)
             {
+                Assert(pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_ENABLED);
                 rc = drvAudioStreamControlInternalBackend(pThis, pStreamEx, PDMAUDIOSTREAMCMD_RESUME);
                 if (RT_SUCCESS(rc))
@@ -2079 +2074 @@
             }
             break;
-        }
 
         default: