Changeset 89510 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Jun 4, 2021 1:20:02 PM (4 years ago)

Author:

vboxsync

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

144868

Message:

Audio: Split up PDMIHOSTAUDIO::pfnStreamControl into individual methods for each command. bugref:9890

Location:

trunk/src/VBox/Main/src-client

Files:

• DrvAudioRec.cpp (modified) (2 diffs)
• DrvAudioVRDE.cpp (modified) (7 diffs)

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

@@ -543 +543 @@
 
 /**
- * Controls an audio output stream
- *
- * @returns VBox status code.
- * @param   pThis               Driver instance.
- * @param   pStreamAV           Audio output stream to control.
- * @param   enmStreamCmd        Stream command to issue.
- */
-static int avRecControlStreamOut(PDRVAUDIORECORDING pThis, PAVRECSTREAM pStreamAV, PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    RT_NOREF(pThis, pStreamAV);
-
-    int rc;
-    switch (enmStreamCmd)
-    {
-        case PDMAUDIOSTREAMCMD_ENABLE:
-        case PDMAUDIOSTREAMCMD_DISABLE:
-        case PDMAUDIOSTREAMCMD_RESUME:
-        case PDMAUDIOSTREAMCMD_PAUSE:
-        case PDMAUDIOSTREAMCMD_DRAIN:
-            rc = VINF_SUCCESS;
-            break;
-
-        default:
-            rc = VERR_NOT_SUPPORTED;
-            break;
-    }
-
-    return rc;
-}
-
-
-/**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
- */
-static DECLCALLBACK(int) drvAudioVideoRecHA_StreamControl(PPDMIHOSTAUDIO pInterface,
-                                                          PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    PDRVAUDIORECORDING pThis     = RT_FROM_CPP_MEMBER(pInterface, DRVAUDIORECORDING, IHostAudio);
-    PAVRECSTREAM       pStreamAV = (PAVRECSTREAM)pStream;
-    AssertPtrReturn(pStreamAV, VERR_INVALID_POINTER);
-
-    if (pStreamAV->Cfg.enmDir == PDMAUDIODIR_OUT)
-        return avRecControlStreamOut(pThis, pStreamAV, enmStreamCmd);
-
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamEnable}
+ */
+static DECLCALLBACK(int) drvAudioVideoRecHA_StreamEnable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    RT_NOREF(pInterface, pStream);
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDisable}
+ */
+static DECLCALLBACK(int) drvAudioVideoRecHA_StreamDisable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    RT_NOREF(pInterface, pStream);
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPause}
+ */
+static DECLCALLBACK(int) drvAudioVideoRecHA_StreamPause(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    RT_NOREF(pInterface, pStream);
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamResume}
+ */
+static DECLCALLBACK(int) drvAudioVideoRecHA_StreamResume(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    RT_NOREF(pInterface, pStream);
+    return VINF_SUCCESS;
+}
+
+
+/**
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDrain}
+ */
+static DECLCALLBACK(int) drvAudioVideoRecHA_StreamDrain(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
+{
+    RT_NOREF(pInterface, pStream);
     return VINF_SUCCESS;
 }
@@ -1114 +1115 @@
     pThis->IHostAudio.pfnStreamDestroy              = drvAudioVideoRecHA_StreamDestroy;
     pThis->IHostAudio.pfnStreamNotifyDeviceChanged  = NULL;
-    pThis->IHostAudio.pfnStreamControl              = drvAudioVideoRecHA_StreamControl;
+    pThis->IHostAudio.pfnStreamEnable               = drvAudioVideoRecHA_StreamEnable;
+    pThis->IHostAudio.pfnStreamDisable              = drvAudioVideoRecHA_StreamDisable;
+    pThis->IHostAudio.pfnStreamPause                = drvAudioVideoRecHA_StreamPause;
+    pThis->IHostAudio.pfnStreamResume               = drvAudioVideoRecHA_StreamResume;
+    pThis->IHostAudio.pfnStreamDrain                = drvAudioVideoRecHA_StreamDrain;
     pThis->IHostAudio.pfnStreamGetState             = drvAudioVideoRecHA_StreamGetState;
     pThis->IHostAudio.pfnStreamGetPending           = NULL;

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

@@ -417 +417 @@
 
 /**
- * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamEnable}
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamEnable}
  */
 static DECLCALLBACK(int) drvAudioVrdeHA_StreamEnable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
@@ -451 +451 @@
 
 /**
- * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamDisable}
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDisable}
  */
 static DECLCALLBACK(int) drvAudioVrdeHA_StreamDisable(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
@@ -477 +477 @@
 
 /**
- * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamPause}
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamPause}
  */
 static DECLCALLBACK(int) drvAudioVrdeHA_StreamPause(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
@@ -495 +495 @@
 
 /**
- * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamResume}
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamResume}
  */
 static DECLCALLBACK(int) drvAudioVrdeHA_StreamResume(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
@@ -513 +513 @@
 
 /**
- * @ interface_method_impl{PDMIHOSTAUDIO,pfnStreamDrain}
+ * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamDrain}
  */
 static DECLCALLBACK(int) drvAudioVrdeHA_StreamDrain(PPDMIHOSTAUDIO pInterface, PPDMAUDIOBACKENDSTREAM pStream)
@@ -520 +520 @@
     LogFlowFunc(("returns VINF_SUCCESS\n"));
     return VINF_SUCCESS;
-}
-
-
-/**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamControl}
- */
-static DECLCALLBACK(int) drvAudioVrdeHA_StreamControl(PPDMIHOSTAUDIO pInterface,
-                                                      PPDMAUDIOBACKENDSTREAM pStream, PDMAUDIOSTREAMCMD enmStreamCmd)
-{
-    /** @todo r=bird: I'd like to get rid of this pfnStreamControl method,
-     *        replacing it with individual StreamXxxx methods.  That would save us
-     *        potentally huge switches and more easily see which drivers implement
-     *        which operations (grep for pfnStreamXxxx). */
-    switch (enmStreamCmd)
-    {
-        case PDMAUDIOSTREAMCMD_ENABLE:
-            return drvAudioVrdeHA_StreamEnable(pInterface, pStream);
-        case PDMAUDIOSTREAMCMD_DISABLE:
-            return drvAudioVrdeHA_StreamDisable(pInterface, pStream);
-        case PDMAUDIOSTREAMCMD_PAUSE:
-            return drvAudioVrdeHA_StreamPause(pInterface, pStream);
-        case PDMAUDIOSTREAMCMD_RESUME:
-            return drvAudioVrdeHA_StreamResume(pInterface, pStream);
-        case PDMAUDIOSTREAMCMD_DRAIN:
-            return drvAudioVrdeHA_StreamDrain(pInterface, pStream);
-
-        case PDMAUDIOSTREAMCMD_END:
-        case PDMAUDIOSTREAMCMD_32BIT_HACK:
-        case PDMAUDIOSTREAMCMD_INVALID:
-            /* no default*/
-            break;
-    }
-    return VERR_NOT_SUPPORTED;
 }
 
@@ -776 +743 @@
     pThis->IHostAudio.pfnStreamDestroy              = drvAudioVrdeHA_StreamDestroy;
     pThis->IHostAudio.pfnStreamNotifyDeviceChanged  = NULL;
-    pThis->IHostAudio.pfnStreamControl              = drvAudioVrdeHA_StreamControl;
+    pThis->IHostAudio.pfnStreamEnable               = drvAudioVrdeHA_StreamEnable;
+    pThis->IHostAudio.pfnStreamDisable              = drvAudioVrdeHA_StreamDisable;
+    pThis->IHostAudio.pfnStreamPause                = drvAudioVrdeHA_StreamPause;
+    pThis->IHostAudio.pfnStreamResume               = drvAudioVrdeHA_StreamResume;
+    pThis->IHostAudio.pfnStreamDrain                = drvAudioVrdeHA_StreamDrain;
     pThis->IHostAudio.pfnStreamGetState             = drvAudioVrdeHA_StreamGetState;
     pThis->IHostAudio.pfnStreamGetPending           = NULL;