[Qemu-devel] [PATCH 45/46] Remove AUDIO_DRIVERS define

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 audio/audio.c |   25 ++++++++++++++++++++++++-
 configure     |    3 ---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/audio/audio.c b/audio/audio.c
index 694a83e..00b0c9c 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -38,7 +38,30 @@
 #define SW_NAME(sw) (sw)->name ? (sw)->name : "unknown"

 static struct audio_driver *drvtab[] = {
-    AUDIO_DRIVERS
+#ifdef CONFIG_ALSA
+    &alsa_audio_driver,
+#endif
+#ifdef CONFIG_COREAUDIO
+    &coreaudio_audio_driver,
+#endif
+#ifdef CONFIG_DSOUND
+    &dsound_audio_driver,
+#endif
+#ifdef CONFIG_ESD
+    &esd_audio_driver,
+#endif
+#ifdef CONFIG_FMOD
+    &fmod_audio_driver,
+#endif
+#ifdef CONFIG_OSS
+    &oss_audio_driver,
+#endif
+#ifdef CONFIG_PA
+    &pa_audio_driver,
+#endif
+#ifdef CONFIG_SDL
+    &sdl_audio_driver,
+#endif
     &no_audio_driver,
     &wav_audio_driver
 };
diff --git a/configure b/configure
index f80fc5c..1aa9d05 100755
--- a/configure
+++ b/configure
@@ -1592,9 +1592,7 @@ for card in $audio_card_list; do
     echo "$def=y" >> $config_host_mak
     echo "#define $def 1" >> $config_host_h
 done
-echo "#define AUDIO_DRIVERS \\" >> $config_host_h
 for drv in $audio_drv_list; do
-    echo "    &${drv}_audio_driver, \\" >>$config_host_h
     def=CONFIG_`echo $drv | tr '[:lower:]' '[:upper:]'`
     echo "$def=y" >> $config_host_mak
     if test "$drv" = "fmod"; then
@@ -1604,7 +1602,6 @@ for drv in $audio_drv_list; do
         echo "OSS_LIBS=$oss_lib" >> $config_host_mak
     fi
 done
-echo "" >>$config_host_h
 if test "$mixemu" = "yes" ; then
   echo "CONFIG_MIXEMU=y" >> $config_host_mak
   echo "#define CONFIG_MIXEMU 1" >> $config_host_h
-- 
1.6.2.5