[Qemu-devel] [6258] More flexible audio card selection

[malc]

Revision: 6258
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6258
Author:   malc
Date:     2009-01-09 10:46:34 +0000 (Fri, 09 Jan 2009)

Log Message:
-----------
More flexible audio card selection

Modified Paths:
--------------
    trunk/configure
    trunk/vl.c

Modified: trunk/configure
===================================================================
--- trunk/configure     2009-01-09 06:43:25 UTC (rev 6257)
+++ trunk/configure     2009-01-09 10:46:34 UTC (rev 6258)
@@ -27,7 +27,8 @@
 cross_prefix=""
 cc="gcc"
 audio_drv_list=""
-audio_card_list=""
+audio_card_list="ac97 es1370 sb16"
+audio_possible_cards="ac97 es1370 sb16 cs4231a adlib gus"
 host_cc="gcc"
 ar="ar"
 make="make"
@@ -519,8 +520,8 @@
 echo "  --enable-cocoa           enable COCOA (Mac OS X only)"
 echo "  --audio-drv-list=LIST    set audio drivers list:"
 echo "                           Available drivers: $audio_possible_drivers"
-echo "  --audio-card-list=LIST   set list of additional emulated audio cards"
-echo "                           Available cards: ac97 adlib cs4231a gus"
+echo "  --audio-card-list=LIST   set list of emulated audio cards 
[$audio_card_list]"
+echo "                           Available cards: $audio_possible_cards"
 echo "  --enable-mixemu          enable mixer emulation"
 echo "  --disable-brlapi         disable BrlAPI"
 echo "  --disable-vnc-tls        disable TLS encryption for VNC server"

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2009-01-09 06:43:25 UTC (rev 6257)
+++ trunk/vl.c  2009-01-09 10:46:34 UTC (rev 6258)
@@ -4266,6 +4266,8 @@
         { .init_isa = pcspk_audio_init }
     },
 #endif
+
+#ifdef CONFIG_SB16
     {
         "sb16",
         "Creative Sound Blaster 16",
@@ -4273,6 +4275,7 @@
         1,
         { .init_isa = SB16_init }
     },
+#endif
 
 #ifdef CONFIG_CS4231A
     {
@@ -4308,6 +4311,7 @@
     },
 #endif
 
+#ifdef CONFIG_AC97
     {
         "ac97",
         "Intel 82801AA AC97 Audio",
@@ -4315,7 +4319,9 @@
         0,
         { .init_pci = ac97_init }
     },
+#endif
 
+#ifdef CONFIG_ES1370
     {
         "es1370",
         "ENSONIQ AudioPCI ES1370",
@@ -4325,6 +4331,8 @@
     },
 #endif
 
+#endif /* HAS_AUDIO_CHOICE */
+
     { NULL, NULL, 0, 0, { NULL } }
 };