Changeset 88381 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 7, 2021 8:43:55 AM (4 years ago)

Author:

vboxsync

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

143628

Message:

Audio: Made the pfnInit method of the PDMIHOSTAUDIO interface optional. Removed a bunch of stubs and moved the DSound init code to the constructor. bugref:9890

Location:

trunk/src/VBox/Main/src-client

Files:

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

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

@@ -635 +635 @@
 
 /**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
- */
-static DECLCALLBACK(int) drvAudioVideoRecHA_Init(PPDMIHOSTAUDIO pInterface)
-{
-    AssertPtrReturn(pInterface, VERR_INVALID_POINTER);
-
-    LogFlowFuncEnter();
-
-    PDRVAUDIORECORDING pThis = PDMIHOSTAUDIO_2_DRVAUDIORECORDING(pInterface);
-
-    LogRel(("Recording: Audio driver is using %RU32Hz, %RU16bit, %RU8 channel%s\n",
-            PDMAudioPropsHz(&pThis->CodecParms.PCMProps), PDMAudioPropsSampleBits(&pThis->CodecParms.PCMProps),
-            PDMAudioPropsChannels(&pThis->CodecParms.PCMProps), PDMAudioPropsChannels(&pThis->CodecParms.PCMProps) == 1 ? "" : "s"));
-
-    int rc = avRecSinkInit(pThis, &pThis->Sink, &pThis->ContainerParms, &pThis->CodecParms);
-    if (RT_FAILURE(rc))
-        LogRel(("Recording: Audio recording driver failed to initialize, rc=%Rrc\n", rc));
-    else
-        LogRel2(("Recording: Audio recording driver initialized\n"));
-
-    return rc;
-}
-
-
-/**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
  */
@@ -1128 +1103 @@
     pDrvIns->IBase.pfnQueryInterface = drvAudioVideoRecQueryInterface;
     /* IHostAudio */
-    pThis->IHostAudio.pfnInit               = drvAudioVideoRecHA_Init;
+    pThis->IHostAudio.pfnInit               = NULL;
     pThis->IHostAudio.pfnShutdown           = drvAudioVideoRecHA_Shutdown;
     pThis->IHostAudio.pfnGetConfig          = drvAudioVideoRecHA_GetConfig;
@@ -1214 +1189 @@
      * Described in CFGM tree.
      */
+/** @todo r=bird: What on earth do you think you need this for?!? It's not an
+ * interface lower drivers are supposed to be messing with! */
     pThis->pDrvAudio = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIAUDIOCONNECTOR);
     AssertMsgReturn(pThis->pDrvAudio, ("Configuration error: No upper interface specified!\n"), VERR_PDM_MISSING_INTERFACE_ABOVE);
@@ -1222 +1199 @@
 #endif
 
-    return VINF_SUCCESS;
+    /*
+     * Init the recording sink.
+     */
+    LogRel(("Recording: Audio driver is using %RU32Hz, %RU16bit, %RU8 channel%s\n",
+            PDMAudioPropsHz(&pThis->CodecParms.PCMProps), PDMAudioPropsSampleBits(&pThis->CodecParms.PCMProps),
+            PDMAudioPropsChannels(&pThis->CodecParms.PCMProps), PDMAudioPropsChannels(&pThis->CodecParms.PCMProps) == 1 ? "" : "s"));
+
+    rc = avRecSinkInit(pThis, &pThis->Sink, &pThis->ContainerParms, &pThis->CodecParms);
+    if (RT_SUCCESS(rc))
+        LogRel2(("Recording: Audio recording driver initialized\n"));
+    else
+        LogRel(("Recording: Audio recording driver initialization failed: %Rrc\n", rc));
+
+    return rc;
 }
 

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

@@ -213 +213 @@
 }
 
-
-/**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
- */
-static DECLCALLBACK(int) drvAudioVrdeHA_Init(PPDMIHOSTAUDIO pInterface)
-{
-    RT_NOREF(pInterface);
-    LogFlowFuncEnter();
-
-    return VINF_SUCCESS;
-}
-
-
 /**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnStreamCapture}
@@ -703 +690 @@
     pDrvIns->IBase.pfnQueryInterface = drvAudioVrdeQueryInterface;
     /* IHostAudio */
-    pThis->IHostAudio.pfnInit              = drvAudioVrdeHA_Init;
+    pThis->IHostAudio.pfnInit              = NULL;
     pThis->IHostAudio.pfnShutdown          = drvAudioVrdeHA_Shutdown;
     pThis->IHostAudio.pfnGetConfig         = drvAudioVrdeHA_GetConfig;