Changeset 88384 in vbox for trunk/src/VBox/Devices

Timestamp:

Apr 7, 2021 9:22:20 AM (4 years ago)

Author:

vboxsync

Message:

DrvHostAudioAlsa: Moved the drvHostAlsaAudioHA_Init code into the constructor and removed the shutdown stub. bugref:9890

File:

• trunk/src/VBox/Devices/Audio/DrvHostAudioAlsa.cpp (modified) (4 diffs)

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

@@ -566 +566 @@
 
     return VINF_SUCCESS;
-}
-
-/**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnInit}
- */
-static DECLCALLBACK(int) drvHostAlsaAudioHA_Init(PPDMIHOSTAUDIO pInterface)
-{
-    RT_NOREF(pInterface);
-
-    LogFlowFuncEnter();
-
-    int rc = audioLoadAlsaLib();
-    if (RT_FAILURE(rc))
-        LogRel(("ALSA: Failed to load the ALSA shared library, rc=%Rrc\n", rc));
-    else
-    {
-#ifdef DEBUG
-        snd_lib_error_set_handler(alsaDbgErrorHandler);
-#endif
-    }
-
-    return rc;
 }
 
@@ -1250 +1228 @@
 
 /**
- * @interface_method_impl{PDMIHOSTAUDIO,pfnShutdown}
- */
-static DECLCALLBACK(void) drvHostAlsaAudioHA_Shutdown(PPDMIHOSTAUDIO pInterface)
-{
-    RT_NOREF(pInterface);
-}
-
-
-/**
  * @interface_method_impl{PDMIHOSTAUDIO,pfnGetStatus}
  */
@@ -1476 +1445 @@
     pDrvIns->IBase.pfnQueryInterface = drvHostAlsaAudioQueryInterface;
     /* IHostAudio */
-    pThis->IHostAudio.pfnInit               = drvHostAlsaAudioHA_Init;
-    pThis->IHostAudio.pfnShutdown           = drvHostAlsaAudioHA_Shutdown;
+    pThis->IHostAudio.pfnInit               = NULL;
+    pThis->IHostAudio.pfnShutdown           = NULL;
     pThis->IHostAudio.pfnGetConfig          = drvHostAlsaAudioHA_GetConfig;
     pThis->IHostAudio.pfnGetStatus          = drvHostAlsaAudioHA_GetStatus;
@@ -1501 +1470 @@
     AssertRCReturn(rc, rc);
 
+    /*
+     * Init the alsa library.
+     */
+    rc = audioLoadAlsaLib();
+    if (RT_FAILURE(rc))
+    {
+        LogRel(("ALSA: Failed to load the ALSA shared library: %Rrc\n", rc));
+        return rc;
+    }
+#ifdef DEBUG
+    snd_lib_error_set_handler(alsaDbgErrorHandler);
+#endif
     return VINF_SUCCESS;
 }