Changeset 5063 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Sep 26, 2007 6:03:09 PM (17 years ago)

Author:

vboxsync

Message:

Only load the ALSA driver if ALSA audio is selected for the VM

File:

• trunk/src/VBox/Devices/Audio/audio.c (modified) (4 diffs)

trunk/src/VBox/Devices/Audio/audio.c

@@ -1556 +1556 @@
         for (i = 0; i < sizeof (drvtab) / sizeof (drvtab[0]); i++) {
             /* The ALSA entry can be null if we couldn't load the library */
-            if (drvtab[i] != NULL)
-            {
+            if (drvtab[i] != NULL) {
                 if (!strcmp (drvname, drvtab[i]->name)) {
                     done = !audio_driver_init (s, drvtab[i]);
@@ -1573 +1572 @@
     if (!done) {
         for (i = 0; !done && i < sizeof (drvtab) / sizeof (drvtab[0]); i++) {
-            if (drvtab[i]->can_be_default) {
-                LogRel(("Audio: Initialization of driver '%s' failed, trying '%s'.\n",
-                       drvname, drvtab[i]->name));
-                drvname = drvtab[i]->name;
-                done = !audio_driver_init (s, drvtab[i]);
+            if (drvtab[i] != NULL) {
+                if (drvtab[i]->can_be_default) {
+                    LogRel(("Audio: Initialization of driver '%s' failed, trying '%s'.\n",
+                           drvname, drvtab[i]->name));
+                    drvname = drvtab[i]->name;
+                    done = !audio_driver_init (s, drvtab[i]);
+                }
             }
         }
@@ -1879 +1880 @@
     LogFlow(("drvAUDIOConstruct:\n"));
     /*
-     * Load the ALSA driver if needed
-     */
-#if defined(RT_OS_LINUX) && defined(VBOX_WITH_ALSA)
-    Log2(("Loading ALSA library %s\n", VBOX_LIB_ALSA));
-    rc = (RTLdrLoad(VBOX_LIB_ALSA, &hLibVBoxAlsa));
-    if (RT_FAILURE(rc))
-    {
-        Log(("Failed to load ALSA library %s.  Reason: %Rrc\n", VBOX_LIB_ALSA, rc));
-    }
-    else
-    {
-        rc = RTLdrGetSymbol(hLibVBoxAlsa, "alsa_audio_driver", (void **) &drvtab[1]);
-        if (RT_FAILURE(rc))
-        {
-            Log(("Failed to get symbol \"alsa_audio_driver\" from library %s.  Reason: %Rrc\n",
-                 VBOX_LIB_ALSA, rc));
-            drvtab[1] = NULL;
-        }
-    }
-#endif
-    /*
      * Validate the config.
      */
@@ -1919 +1899 @@
     if (VBOX_FAILURE (rc))
         return rc;
+
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_ALSA)
+    /*
+     * Load the ALSA driver if needed.  This is a hack to remove the
+     * hard dependency on libasound.so.
+     */
+    if (0 == strcmp(drvname, "alsa")) {
+        Log2(("Loading ALSA library %s\n", VBOX_LIB_ALSA));
+        rc = (RTLdrLoad(VBOX_LIB_ALSA, &hLibVBoxAlsa));
+        if (RT_FAILURE(rc)) {
+            Log(("Failed to load ALSA library %s.  Reason: %Rrc\n", VBOX_LIB_ALSA, rc));
+        } else {
+            rc = RTLdrGetSymbol(hLibVBoxAlsa, "alsa_audio_driver", (void **) &drvtab[1]);
+            if (RT_FAILURE(rc)) {
+                Log(("Failed to get symbol \"alsa_audio_driver\" from library %s.  Reason: %Rrc\n",
+                     VBOX_LIB_ALSA, rc));
+                drvtab[1] = NULL;
+            }
+        }
+    }
+#endif
 
     rc = AUD_init (pDrvIns, drvname);