From nobody Wed Oct 22 13:07:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1519899793652300.8125258084748; Thu, 1 Mar 2018 02:23:13 -0800 (PST) Received: from localhost ([::1]:55350 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erLMh-0002zT-MD for importer@patchew.org; Thu, 01 Mar 2018 05:23:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42694) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erL65-0005JD-DD for qemu-devel@nongnu.org; Thu, 01 Mar 2018 05:06:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erL5z-00051s-Fe for qemu-devel@nongnu.org; Thu, 01 Mar 2018 05:05:57 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:43276 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erL5z-00051P-Bn for qemu-devel@nongnu.org; Thu, 01 Mar 2018 05:05:51 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EFAC0404084B for ; Thu, 1 Mar 2018 10:05:50 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-147.ams2.redhat.com [10.36.116.147]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EE4810AF9F2; Thu, 1 Mar 2018 10:05:50 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 77F781FCC1; Thu, 1 Mar 2018 11:05:48 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Thu, 1 Mar 2018 11:05:46 +0100 Message-Id: <20180301100547.18962-13-kraxel@redhat.com> In-Reply-To: <20180301100547.18962-1-kraxel@redhat.com> References: <20180301100547.18962-1-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 01 Mar 2018 10:05:50 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 01 Mar 2018 10:05:50 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'kraxel@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 12/13] audio: rename CONFIG_* to CONFIG_AUDIO_* X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- 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 5ecd538617..105f79ef3d 100755 --- a/configure +++ b/configure @@ -5969,7 +5969,7 @@ if test "$cap_ng" =3D "yes" ; then fi echo "CONFIG_AUDIO_DRIVERS=3D$audio_drv_list" >> $config_host_mak for drv in $audio_drv_list; do - def=3DCONFIG_$(echo $drv | LC_ALL=3DC tr '[a-z]' '[A-Z]') + def=3DCONFIG_AUDIO_$(echo $drv | LC_ALL=3DC tr '[a-z]' '[A-Z]') echo "$def=3Dy" >> $config_host_mak done echo "ALSA_LIBS=3D$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 =20 -#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 =3D audio.o noaudio.o wavaudio.o mixeng.o -common-obj-$(CONFIG_SDL) +=3D sdlaudio.o -common-obj-$(CONFIG_OSS) +=3D ossaudio.o +common-obj-$(CONFIG_AUDIO_SDL) +=3D sdlaudio.o +common-obj-$(CONFIG_AUDIO_OSS) +=3D ossaudio.o common-obj-$(CONFIG_SPICE) +=3D spiceaudio.o -common-obj-$(CONFIG_COREAUDIO) +=3D coreaudio.o -common-obj-$(CONFIG_ALSA) +=3D alsaaudio.o -common-obj-$(CONFIG_DSOUND) +=3D dsoundaudio.o -common-obj-$(CONFIG_PA) +=3D paaudio.o +common-obj-$(CONFIG_AUDIO_COREAUDIO) +=3D coreaudio.o +common-obj-$(CONFIG_AUDIO_ALSA) +=3D alsaaudio.o +common-obj-$(CONFIG_AUDIO_DSOUND) +=3D dsoundaudio.o +common-obj-$(CONFIG_AUDIO_PA) +=3D paaudio.o common-obj-$(CONFIG_AUDIO_PT_INT) +=3D audio_pt_int.o common-obj-$(CONFIG_AUDIO_WIN_INT) +=3D audio_win_int.o common-obj-y +=3D wavcapture.o --=20 2.9.3