audio merge (malc)

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1601 c046a42c-6fe2-441c-8c8c-71466251a162

1 files changed, 13 insertions, 9 deletions

diff --git a/hw/pc.c b/hw/pc.c
index 90a0e48fa1..324f5367d1 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -601,19 +601,23 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
     DMA_init(0);
 
     if (audio_enabled) {
-        AUD_init();
-        if (sb16_enabled)
-            SB16_init ();
+        AudioState *audio;
+
+        audio = AUD_init();
+        if (audio) {
+            if (sb16_enabled)
+                SB16_init (audio);
 #ifdef CONFIG_ADLIB
-        if (adlib_enabled)
-            Adlib_init ();
+            if (adlib_enabled)
+                Adlib_init (audio);
 #endif
 #ifdef CONFIG_GUS
-        if (gus_enabled)
-            GUS_init ();
+            if (gus_enabled)
+                GUS_init (audio);
 #endif
-        if (pci_enabled && es1370_enabled)
-            es1370_init (pci_bus);
+            if (pci_enabled && es1370_enabled)
+                es1370_init (pci_bus, audio);
+        }
     }
 
     floppy_controller = fdctrl_init(6, 2, 0, 0x3f0, fd_table);