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

Timestamp:

Sep 26, 2007 2:55:04 PM (17 years ago)

Author:

vboxsync

Message:

Moved the ALSA code into a separate shared object loaded at runtime

Location:

trunk/src/VBox/Devices/Audio

Files:

• alsaaudio.c (modified) (2 diffs)
• audio.c (modified) (4 diffs)
• audio.h (modified) (2 diffs)
• audio_int.h (modified) (4 diffs)

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

@@ -33 +33 @@
 
 #include "Builtins.h"
-#include "../../vl_vbox.h"
+#include "vl_vbox.h"
 #include "audio.h"
 #include <iprt/alloc.h>
@@ -1089 +1089 @@
 };
 
+extern DECLEXPORT(struct audio_driver) alsa_audio_driver;
 struct audio_driver alsa_audio_driver = {
     INIT_FIELD (name           = ) "alsa",

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

@@ -33 +33 @@
 #include <iprt/alloc.h>
 
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_ALSA)
+# include <iprt/ldr.h>
+# define VBOX_LIB_ALSA "VBoxAlsa"
+#endif
+
 #include "Builtins.h"
 #include "../../vl_vbox.h"
@@ -62 +67 @@
 } DRVAUDIO, *PDRVAUDIO;
 
+#if !(defined(RT_OS_LINUX) && defined(VBOX_WITH_ALSA))
 static struct audio_driver *drvtab[] = {
-#ifdef RT_OS_LINUX
+# ifdef RT_OS_LINUX
     &oss_audio_driver,
-#ifdef VBOX_WITH_ALSA
-    &alsa_audio_driver,
-#endif
-#endif
-#ifdef RT_OS_DARWIN
+# endif
+# ifdef RT_OS_DARWIN
     &coreaudio_audio_driver,
-#endif
-#ifdef RT_OS_WINDOWS
+# endif
+# ifdef RT_OS_WINDOWS
     &dsound_audio_driver,
-#endif
-#ifdef RT_OS_L4
+# endif
+# ifdef RT_OS_L4
     &oss_audio_driver,
-#endif
+# endif
     &no_audio_driver
 };
+#else
+static struct audio_driver *drvtab[] = {
+    &oss_audio_driver,
+    NULL, /* alsa_audio_driver is now in a shared object */
+    &no_audio_driver
+};
+#endif
 
 struct fixed_settings {
@@ -1545 +1555 @@
 
         for (i = 0; i < sizeof (drvtab) / sizeof (drvtab[0]); i++) {
-            if (!strcmp (drvname, drvtab[i]->name)) {
-                done = !audio_driver_init (s, drvtab[i]);
-                found = 1;
-                break;
+            /* The ALSA entry can be null if we couldn't load the library */
+            if (drvtab[i] != NULL)
+            {
+                if (!strcmp (drvname, drvtab[i]->name)) {
+                    done = !audio_driver_init (s, drvtab[i]);
+                    found = 1;
+                    break;
+                }
             }
         }
@@ -1859 +1873 @@
     PDRVAUDIO pData = PDMINS2DATA(pDrvIns, PDRVAUDIO);
     char *drvname;
+#if defined(RT_OS_LINUX) && defined(VBOX_WITH_ALSA)
+    RTLDRMOD hLibVBoxAlsa;
+#endif
 
     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.

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

@@ -25 +25 @@
 #define QEMU_AUDIO_H
 
+#ifdef VBOX
+# include <iprt/types.h>
+#endif
+
 #include "sys-queue.h"
 
@@ -105 +109 @@
 } QEMUAudioTimeStamp;
 
+#ifdef VBOX
+extern DECLEXPORT(void) AUD_vlog (const char *cap, const char *fmt, va_list ap);
+extern DECLEXPORT(void) AUD_log (const char *cap, const char *fmt, ...)
+#else
 void AUD_vlog (const char *cap, const char *fmt, va_list ap);
 void AUD_log (const char *cap, const char *fmt, ...)
+#endif
 #if defined (__GNUC__) && !defined (VBOX) /* VBox: oh, please, shut up. */
     __attribute__ ((__format__ (__printf__, 2, 3)))

trunk/src/VBox/Devices/Audio/audio_int.h

@@ -34 +34 @@
 #endif
 
+#ifdef VBOX
+#include <iprt/types.h>
+#endif
+
 #include <limits.h>
 #include "mixeng.h"
@@ -215 +219 @@
 extern struct audio_driver coreaudio_audio_driver;
 extern struct audio_driver dsound_audio_driver;
-extern volume_t nominal_volume;
 #ifdef VBOX
+extern DECLEXPORT(volume_t) nominal_volume;
 extern volume_t pcm_out_volume;
 extern volume_t pcm_in_volume;
+#else
+extern volume_t nominal_volume;
 #endif
 
@@ -224 +230 @@
 uint64_t audio_get_ticks_per_sec (void);
 
+#ifdef VBOX
+extern DECLEXPORT(void) audio_pcm_init_info (struct audio_pcm_info *info, audsettings_t *as);
+void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int len);
+
+extern DECLEXPORT(int)  audio_pcm_sw_write (SWVoiceOut *sw, void *buf, int len);
+extern DECLEXPORT(int)  audio_pcm_hw_get_live_in (HWVoiceIn *hw);
+
+extern DECLEXPORT(int)  audio_pcm_sw_read (SWVoiceIn *sw, void *buf, int len);
+extern DECLEXPORT(int)  audio_pcm_hw_get_live_out (HWVoiceOut *hw);
+int  audio_pcm_hw_get_live_out2 (HWVoiceOut *hw, int *nb_live);
+
+int audio_bug (const char *funcname, int cond);
+extern DECLEXPORT(void *)audio_calloc (const char *funcname, int nmemb, size_t size);
+#else
 void audio_pcm_init_info (struct audio_pcm_info *info, audsettings_t *as);
 void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int len);
@@ -236 +256 @@
 int audio_bug (const char *funcname, int cond);
 void *audio_calloc (const char *funcname, int nmemb, size_t size);
+#endif
 
 #define VOICE_ENABLE 1