Changeset 88887 in vbox for trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp

Timestamp:

May 5, 2021 11:38:58 PM (4 years ago)

Author:

vboxsync

Message:

Audio: Changed PDMIHOSTAUDIO::pfnStreamGetStatus into pfnStreamGetState and defined a simpler state enum (PDMHOSTAUDIOSTREAMSTATE) that fits what DrvAudio needs and the backends actually want to tell us. Fixes one VRDE issue. bugref:9890

File:

• trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp (modified) (3 diffs)

trunk/src/VBox/Main/src-client/DrvAudioVRDE.cpp

@@ -415 +415 @@
         }
     }
-    pDrv->pConsoleVRDPServer = NULL;
+    pDrv->pConsoleVRDPServer = NULL;   /** @todo r=bird: WTF? */
 
     return VINF_SUCCESS;
@@ -595 +595 @@
 
 /**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetStatus}
- */
-static DECLCALLBACK(uint32_t) drvAudioVrdeHA_StreamGetStatus(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamGetState}
+ */
+static DECLCALLBACK(PDMHOSTAUDIOSTREAMSTATE) drvAudioVrdeHA_StreamGetState(PPDMIHOSTAUDIO pInterface,
+                                                                           PPDMAUDIOBACKENDSTREAM pStream)
 {
     PDRVAUDIOVRDE pDrv = RT_FROM_MEMBER(pInterface, DRVAUDIOVRDE, IHostAudio);
-    RT_NOREF(pStream);
-
-    return pDrv->cClients > 0
-         ? PDMAUDIOSTREAM_STS_INITIALIZED | PDMAUDIOSTREAM_STS_ENABLED
-#if 0 /* later mabye */ /** @todo r=bird: Weird backend status mess. */
-         : PDMAUDIOSTREAM_STS_NONE /* play possum if the clients all disappears. Re-init should be underways. */;
-#else
-         : PDMAUDIOSTREAM_STS_INITIALIZED /* If any clients are connected, flag the stream as enabled. */;
-#endif
+    AssertPtrReturn(pStream, PDMHOSTAUDIOSTREAMSTATE_INVALID);
+
+    return pDrv->cClients > 0 ? PDMHOSTAUDIOSTREAMSTATE_OKAY : PDMHOSTAUDIOSTREAMSTATE_INACTIVE;
 }
 
@@ -806 +801 @@
     pThis->IHostAudio.pfnStreamGetWritable          = drvAudioVrdeHA_StreamGetWritable;
     pThis->IHostAudio.pfnStreamGetPending           = NULL;
-    pThis->IHostAudio.pfnStreamGetStatus            = drvAudioVrdeHA_StreamGetStatus;
+    pThis->IHostAudio.pfnStreamGetState             = drvAudioVrdeHA_StreamGetState;
     pThis->IHostAudio.pfnStreamPlay                 = drvAudioVrdeHA_StreamPlay;
     pThis->IHostAudio.pfnStreamCapture              = drvAudioVrdeHA_StreamCapture;