[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/13] audio: rename CONFIG_* to CONFIG_AUDIO_*
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 12/13] audio: rename CONFIG_* to CONFIG_AUDIO_* |
Date: |
Mon, 5 Mar 2018 09:48:43 +0100 |
This avoids a name clash for CONFIG_SDL, which is used by both sdl video
support and sdl audio support. It also more clear that this is a audio
driver configuration.
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
configure | 2 +-
audio/audio_int.h | 2 +-
audio/Makefile.objs | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configure b/configure
index e651533466..269add1187 100755
--- a/configure
+++ b/configure
@@ -5981,7 +5981,7 @@ if test "$cap_ng" = "yes" ; then
fi
echo "CONFIG_AUDIO_DRIVERS=$audio_drv_list" >> $config_host_mak
for drv in $audio_drv_list; do
- def=CONFIG_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]')
+ def=CONFIG_AUDIO_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]')
echo "$def=y" >> $config_host_mak
done
echo "ALSA_LIBS=$alsa_libs" >> $config_host_mak
diff --git a/audio/audio_int.h b/audio/audio_int.h
index 5b25da0a37..700bd43143 100644
--- a/audio/audio_int.h
+++ b/audio/audio_int.h
@@ -25,7 +25,7 @@
#ifndef QEMU_AUDIO_INT_H
#define QEMU_AUDIO_INT_H
-#ifdef CONFIG_COREAUDIO
+#ifdef CONFIG_AUDIO_COREAUDIO
#define FLOAT_MIXENG
/* #define RECIPROCAL */
#endif
diff --git a/audio/Makefile.objs b/audio/Makefile.objs
index 8a5ede6e2b..f6ce5c6744 100644
--- a/audio/Makefile.objs
+++ b/audio/Makefile.objs
@@ -1,11 +1,11 @@
common-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
-common-obj-$(CONFIG_SDL) += sdlaudio.o
-common-obj-$(CONFIG_OSS) += ossaudio.o
+common-obj-$(CONFIG_AUDIO_SDL) += sdlaudio.o
+common-obj-$(CONFIG_AUDIO_OSS) += ossaudio.o
common-obj-$(CONFIG_SPICE) += spiceaudio.o
-common-obj-$(CONFIG_COREAUDIO) += coreaudio.o
-common-obj-$(CONFIG_ALSA) += alsaaudio.o
-common-obj-$(CONFIG_DSOUND) += dsoundaudio.o
-common-obj-$(CONFIG_PA) += paaudio.o
+common-obj-$(CONFIG_AUDIO_COREAUDIO) += coreaudio.o
+common-obj-$(CONFIG_AUDIO_ALSA) += alsaaudio.o
+common-obj-$(CONFIG_AUDIO_DSOUND) += dsoundaudio.o
+common-obj-$(CONFIG_AUDIO_PA) += paaudio.o
common-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o
common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o
common-obj-y += wavcapture.o
--
2.9.3
- [Qemu-devel] [PULL 00/13] Ui 20180305 patches, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 12/13] audio: rename CONFIG_* to CONFIG_AUDIO_*,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 02/13] sdl: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 05/13] egl-headless: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 04/13] curses: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 07/13] console: add ui module loading support, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 03/13] cocoa: switch over to new display registry, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 13/13] ui/sdl: build as module, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 06/13] console: add and use qemu_display_find_default, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 10/13] ui/gtk: build as module, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 08/13] configure: add X11 vars to config-host.mak, Gerd Hoffmann, 2018/03/05
- [Qemu-devel] [PULL 01/13] console: add qemu display registry, add gtk, Gerd Hoffmann, 2018/03/05