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

Timestamp:

Apr 27, 2021 10:24:18 AM (4 years ago)

Author:

vboxsync

Message:

Audio: PDMAUDIOSTREAMSTS_FLAGS_XXX -> PDMAUDIOSTREAM_STS_XXX. bugref:9890

File:

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

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

@@ -326 +326 @@
  * @param   fStatus     Stream status flags to convert.
  */
-static const char *dbgAudioStreamStatusToStr(char pszDst[DRVAUDIO_STATUS_STR_MAX], PDMAUDIOSTREAMSTS fStatus)
+static const char *dbgAudioStreamStatusToStr(char pszDst[DRVAUDIO_STATUS_STR_MAX], uint32_t fStatus)
 {
     static const struct
@@ -332 +332 @@
         const char         *pszMnemonic;
         uint32_t            cchMnemnonic;
-        PDMAUDIOSTREAMSTS   fFlag;
+        uint32_t   fFlag;
     } s_aFlags[] =
     {
-        { RT_STR_TUPLE("INITIALIZED "),     PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED     },
-        { RT_STR_TUPLE("ENABLED "),         PDMAUDIOSTREAMSTS_FLAGS_ENABLED         },
-        { RT_STR_TUPLE("PAUSED "),          PDMAUDIOSTREAMSTS_FLAGS_PAUSED          },
-        { RT_STR_TUPLE("PENDING_DISABLE "), PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE },
-        { RT_STR_TUPLE("NEED_REINIT "),     PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT     },
+        { RT_STR_TUPLE("INITIALIZED "),     PDMAUDIOSTREAM_STS_INITIALIZED     },
+        { RT_STR_TUPLE("ENABLED "),         PDMAUDIOSTREAM_STS_ENABLED         },
+        { RT_STR_TUPLE("PAUSED "),          PDMAUDIOSTREAM_STS_PAUSED          },
+        { RT_STR_TUPLE("PENDING_DISABLE "), PDMAUDIOSTREAM_STS_PENDING_DISABLE },
+        { RT_STR_TUPLE("NEED_REINIT "),     PDMAUDIOSTREAM_STS_NEED_REINIT     },
     };
     if (!fStatus)
@@ -428 +428 @@
     LogFunc(("[%s]\n", pStreamEx->Core.szName));
 
-    pStreamEx->Core.fStatus        = PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED;
+    pStreamEx->Core.fStatus        = PDMAUDIOSTREAM_STS_INITIALIZED;
     pStreamEx->Core.fWarningsShown = PDMAUDIOSTREAM_WARN_FLAGS_NONE;
 
@@ -469 +469 @@
             && pStreamEx->Core.cRefs >= 1)
         {
-            if (pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE)
+            if (pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_PENDING_DISABLE)
             {
                 drvAudioStreamIterateInternal(pThis, pStreamEx);
 
-                if (pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE)
+                if (pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_PENDING_DISABLE)
                     cMilliesToNext = 10;
             }
@@ -995 +995 @@
                                                PPDMAUDIOSTREAMCFG pCfgReq, PPDMAUDIOSTREAMCFG pCfgAcq)
 {
-    AssertMsg((pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED) == 0,
+    AssertMsg((pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_INITIALIZED) == 0,
               ("Stream '%s' already initialized in backend\n", pStreamEx->Core.szName));
 
@@ -1083 +1083 @@
                     VERR_INVALID_PARAMETER);
 
-    pStreamEx->Core.fStatus |= PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED;
+    pStreamEx->Core.fStatus |= PDMAUDIOSTREAM_STS_INITIALIZED;
 
     return VINF_SUCCESS;
@@ -1487 +1487 @@
     LogFunc(("[%s] fStatus=%s\n", pStreamEx->Core.szName, dbgAudioStreamStatusToStr(szStreamSts, pStreamEx->Core.fStatus)));
 
-    if (pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED)
+    if (pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_INITIALIZED)
     {
         AssertPtr(pStreamEx->pBackend);
@@ -1496 +1496 @@
             rc = pThis->pHostDrvAudio->pfnStreamDestroy(pThis->pHostDrvAudio, pStreamEx->pBackend);
 
-        pStreamEx->Core.fStatus &= ~PDMAUDIOSTREAMSTS_FLAGS_INITIALIZED;
+        pStreamEx->Core.fStatus &= ~PDMAUDIOSTREAM_STS_INITIALIZED;
     }
 
@@ -1546 +1546 @@
     {
 #ifdef LOG_ENABLED
-        if (pStreamEx->Core.fStatus != PDMAUDIOSTREAMSTS_FLAGS_NONE)
+        if (pStreamEx->Core.fStatus != PDMAUDIOSTREAM_STS_NONE)
         {
             char szStreamSts[DRVAUDIO_STATUS_STR_MAX];
@@ -1553 +1553 @@
         }
 #endif
-        pStreamEx->Core.fStatus = PDMAUDIOSTREAMSTS_FLAGS_NONE;
+        pStreamEx->Core.fStatus = PDMAUDIOSTREAM_STS_NONE;
     }
 
@@ -1661 +1661 @@
      * Gather current stream status.
      */
-    const bool fIsEnabled = RT_BOOL(pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_ENABLED); /* Stream is enabled? */
+    const bool fIsEnabled = RT_BOOL(pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_ENABLED); /* Stream is enabled? */
 
     /*
@@ -1712 +1712 @@
     AssertReturn(pStreamEx->Core.uMagic == PDMAUDIOSTREAM_MAGIC, VERR_INVALID_MAGIC);
     AssertReturn(pStreamEx->uMagic == DRVAUDIOSTREAM_MAGIC, VERR_INVALID_MAGIC);
-    AssertReturn(pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT, VERR_INVALID_STATE);
+    AssertReturn(pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_NEED_REINIT, VERR_INVALID_STATE);
     LogFlowFunc(("\n"));
 
@@ -1718 +1718 @@
     AssertRCReturn(rc, rc);
 
-    if (pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT)
+    if (pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_NEED_REINIT)
     {
         const unsigned cMaxTries = 3; /** @todo Make this configurable? */
@@ -1749 +1749 @@
             {
                 /* Remove the pending re-init flag on success. */
-                pStreamEx->Core.fStatus &= ~PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT;
+                pStreamEx->Core.fStatus &= ~PDMAUDIOSTREAM_STS_NEED_REINIT;
             }
             else
@@ -1767 +1767 @@
 
                 /* Don't try to re-initialize anymore and mark as disabled. */
-                pStreamEx->Core.fStatus &= ~(PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT | PDMAUDIOSTREAMSTS_FLAGS_ENABLED);
+                pStreamEx->Core.fStatus &= ~(PDMAUDIOSTREAM_STS_NEED_REINIT | PDMAUDIOSTREAM_STS_ENABLED);
 
                 /* Note: Further writes to this stream go to / will be read from the bit bucket (/dev/null) from now on. */
@@ -1955 +1955 @@
         case PDMAUDIOSTREAMCMD_ENABLE:
         {
-            if (!(pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_ENABLED))
+            if (!(pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_ENABLED))
             {
                 /* Is a pending disable outstanding? Then disable first. */
-                if (pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE)
+                if (pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_PENDING_DISABLE)
                     rc = drvAudioStreamControlInternalBackend(pThis, pStreamEx, PDMAUDIOSTREAMCMD_DISABLE);
 
@@ -1965 +1965 @@
 
                 if (RT_SUCCESS(rc))
-                    pStreamEx->Core.fStatus |= PDMAUDIOSTREAMSTS_FLAGS_ENABLED;
+                    pStreamEx->Core.fStatus |= PDMAUDIOSTREAM_STS_ENABLED;
             }
             break;
@@ -1972 +1972 @@
         case PDMAUDIOSTREAMCMD_DISABLE:
         {
-            if (pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_ENABLED)
+            if (pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_ENABLED)
             {
                 /*
@@ -1982 +1982 @@
                 {
                     LogFunc(("[%s] Pending disable/pause\n", pStreamEx->Core.szName));
-                    pStreamEx->Core.fStatus |= PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE;
+                    pStreamEx->Core.fStatus |= PDMAUDIOSTREAM_STS_PENDING_DISABLE;
 
                     /* Schedule a follow up timer to the pending-disable state.  We cannot rely
@@ -1998 +1998 @@
 
                 /* Can we close the host stream as well (not in pending disable mode)? */
-                if (!(pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE))
+                if (!(pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_PENDING_DISABLE))
                 {
                     rc = drvAudioStreamControlInternalBackend(pThis, pStreamEx, PDMAUDIOSTREAMCMD_DISABLE);
@@ -2010 +2010 @@
         case PDMAUDIOSTREAMCMD_PAUSE:
         {
-            if (!(pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_PAUSED))
+            if (!(pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_PAUSED))
             {
                 rc = drvAudioStreamControlInternalBackend(pThis, pStreamEx, PDMAUDIOSTREAMCMD_PAUSE);
                 if (RT_SUCCESS(rc))
-                    pStreamEx->Core.fStatus |= PDMAUDIOSTREAMSTS_FLAGS_PAUSED;
+                    pStreamEx->Core.fStatus |= PDMAUDIOSTREAM_STS_PAUSED;
             }
             break;
@@ -2021 +2021 @@
         case PDMAUDIOSTREAMCMD_RESUME:
         {
-            if (pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_PAUSED)
+            if (pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_PAUSED)
             {
                 rc = drvAudioStreamControlInternalBackend(pThis, pStreamEx, PDMAUDIOSTREAMCMD_RESUME);
                 if (RT_SUCCESS(rc))
-                    pStreamEx->Core.fStatus &= ~PDMAUDIOSTREAMSTS_FLAGS_PAUSED;
+                    pStreamEx->Core.fStatus &= ~PDMAUDIOSTREAM_STS_PAUSED;
             }
             break;
@@ -2146 +2146 @@
          * Try play "Windows Navigation Start.wav" on Windows 7 (2824 samples).
          */
-        else if (   (pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE)
+        else if (   (pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_PENDING_DISABLE)
                  && pStreamEx->Out.cbPreBuffered > 0)
         {
@@ -2278 +2278 @@
 
     /* Not enabled or paused? Skip iteration. */
-    if (   !(pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_ENABLED)
-        ||  (pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_PAUSED))
+    if (   !(pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_ENABLED)
+        ||  (pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_PAUSED))
     {
         return VINF_SUCCESS;
@@ -2288 +2288 @@
      */
     int rc = VINF_SUCCESS;
-    if (!(pStreamEx->Core.fStatus & PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE))
+    if (!(pStreamEx->Core.fStatus & PDMAUDIOSTREAM_STS_PENDING_DISABLE))
     { /* likely until we get to the end of the stream at least. */ }
     else
@@ -2348 +2348 @@
                     if (RT_SUCCESS(rc))
                     {
-                        pStreamEx->Core.fStatus &= ~(PDMAUDIOSTREAMSTS_FLAGS_ENABLED | PDMAUDIOSTREAMSTS_FLAGS_PENDING_DISABLE);
+                        pStreamEx->Core.fStatus &= ~(PDMAUDIOSTREAM_STS_ENABLED | PDMAUDIOSTREAM_STS_PENDING_DISABLE);
                         drvAudioStreamDropInternal(pThis, pStreamEx); /* Not a DROP command, just a stream reset. */
                     }
@@ -2441 +2441 @@
              * Reading the actual data from a stream then will return silence then.
              */
-            PDMAUDIOSTREAMSTS fStatus = PDMAUDIOSTREAMSTS_FLAGS_NONE;
+            uint32_t fStatus = PDMAUDIOSTREAM_STS_NONE;
             if (pThis->pHostDrvAudio->pfnStreamGetStatus)
                 fStatus = pThis->pHostDrvAudio->pfnStreamGetStatus(pThis->pHostDrvAudio, pStreamEx->pBackend);
@@ -2545 +2545 @@
  * @interface_method_impl{PDMIAUDIOCONNECTOR,pfnStreamGetStatus}
  */
-static DECLCALLBACK(PDMAUDIOSTREAMSTS) drvAudioStreamGetStatus(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)
+static DECLCALLBACK(uint32_t) drvAudioStreamGetStatus(PPDMIAUDIOCONNECTOR pInterface, PPDMAUDIOSTREAM pStream)
 {
     PDRVAUDIO pThis = RT_FROM_MEMBER(pInterface, DRVAUDIO, IAudioConnector);
@@ -2553 +2553 @@
      *        this necessary? */
     if (!pStream)
-        return PDMAUDIOSTREAMSTS_FLAGS_NONE;
+        return PDMAUDIOSTREAM_STS_NONE;
     PDRVAUDIOSTREAM pStreamEx = (PDRVAUDIOSTREAM)pStream;
-    AssertPtrReturn(pStreamEx, PDMAUDIOSTREAMSTS_FLAGS_NONE);
-    AssertReturn(pStreamEx->Core.uMagic == PDMAUDIOSTREAM_MAGIC, PDMAUDIOSTREAMSTS_FLAGS_NONE);
-    AssertReturn(pStreamEx->uMagic      == DRVAUDIOSTREAM_MAGIC, PDMAUDIOSTREAMSTS_FLAGS_NONE);
+    AssertPtrReturn(pStreamEx, PDMAUDIOSTREAM_STS_NONE);
+    AssertReturn(pStreamEx->Core.uMagic == PDMAUDIOSTREAM_MAGIC, PDMAUDIOSTREAM_STS_NONE);
+    AssertReturn(pStreamEx->uMagic      == DRVAUDIOSTREAM_MAGIC, PDMAUDIOSTREAM_STS_NONE);
 
     int rc = RTCritSectEnter(&pThis->CritSect);
-    AssertRCReturn(rc, PDMAUDIOSTREAMSTS_FLAGS_NONE);
-
-    PDMAUDIOSTREAMSTS fStrmStatus = pStreamEx->Core.fStatus;
+    AssertRCReturn(rc, PDMAUDIOSTREAM_STS_NONE);
+
+    uint32_t fStrmStatus = pStreamEx->Core.fStatus;
 
     RTCritSectLeave(&pThis->CritSect);
@@ -3047 +3047 @@
     RTListForEach(&pThis->lstStreams, pStreamEx, DRVAUDIOSTREAM, ListEntry)
     {
-        pStreamEx->Core.fStatus |= PDMAUDIOSTREAMSTS_FLAGS_NEED_REINIT;
+        pStreamEx->Core.fStatus |= PDMAUDIOSTREAM_STS_NEED_REINIT;
         pStreamEx->cTriesReInit  = 0;
         pStreamEx->nsLastReInit  = 0;