From patchwork Sun Jan 9 17:06:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12707866 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 33399C433F5 for ; Sun, 9 Jan 2022 17:17:40 +0000 (UTC) Received: from localhost ([::1]:45456 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6bp4-0005nS-PR for qemu-devel@archiver.kernel.org; Sun, 09 Jan 2022 12:17:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6beG-0005s2-Mw; Sun, 09 Jan 2022 12:06:29 -0500 Received: from [2a00:1450:4864:20::433] (port=33547 helo=mail-wr1-x433.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6beF-0005S8-05; Sun, 09 Jan 2022 12:06:28 -0500 Received: by mail-wr1-x433.google.com with SMTP id r9so20562628wrg.0; Sun, 09 Jan 2022 09:06:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v1XOO+wU3a7QWA1hgiU3Fs3DmTnRjpKCsIn0H4QIOio=; b=NYrltQvCSoa/CVjyZ3fPA+u4GfE/KEcxgCX8HeD/utW/iDT7baOnztNXscVSICv3ft YtjyoaNvLlOps9Gy5BQknGH9Y7Udj/c3nkHN9L5k8FX8KrFLJh/bEw35sMD3dpGmrG1B mQB/LXvuEwKGRCiwLOZOsEeo8UVY+e3L5nMRnOGwyg7trM8ierv8rluvrDXiRNctNHo+ 95aHVY2teUdEvTFSvCW4Pkj+mkovkC9eHGql4x4KM0ouM1M+0xKaMUc5APOo9i169tPM /jC8DMz7q1evYyJKJcQRrLI+zyrlzfEqgHvQ+UCAY7NaAn1NzYAh7ZvXCZW+LH0o6lwv jftg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=v1XOO+wU3a7QWA1hgiU3Fs3DmTnRjpKCsIn0H4QIOio=; b=f46vHhjZiWoK5W2DfmLY40SeHU1O3MEP6t/YTwHuf6H9FtI2PveDlIdx3S5M+ZwXXx U4/fTngWLR1pT4GdbQElUtqQhy2CiL6qnign3E3JILFMD05FTIKmkRFEJiP5YOR0F1vu Bf3hFFfs2v7rXa49oJOnkD/TRlfcAY3FpTAs4oaBikh9pI1eG3E5bqZ8x0obaOI7qJhw BwnUTsTDrW+cZjDpw91POg2bjFuQ4B40c7idntaX2rFFK9l7qyPTnzDKSRxGwDwRB81n TjV4JpxYK7CMSgRUangz7AA28nweMX44mDmRfI4AOu6bTxctseDH8DLFT2E4ThMuQmJc Hltg== X-Gm-Message-State: AOAM531dJHGE6ARG44QiT7RQQN/p1V6Nc/spLVH3Nxt8P0B9K1DRyhnn 6Qk7D/l/gWEYAdELzG2/EqGFkVcqZDlkog== X-Google-Smtp-Source: ABdhPJw26C/oEqJjz/QeytaOKAvwqk4D434ffOfoLvVPEkwO9dBvOX1omaqHrkz7saVfX8o15W6Wpw== X-Received: by 2002:a5d:6908:: with SMTP id t8mr130691wru.382.1641747984438; Sun, 09 Jan 2022 09:06:24 -0800 (PST) Received: from nuc.. (83.red-83-50-87.dynamicip.rima-tde.net. [83.50.87.83]) by smtp.gmail.com with ESMTPSA id m35sm8167437wms.1.2022.01.09.09.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jan 2022 09:06:24 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH v2 2/6] audio/coreaudio: Remove a deprecation warning on macOS 12 Date: Sun, 9 Jan 2022 18:06:08 +0100 Message-Id: <20220109170612.574104-3-f4bug@amsat.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220109170612.574104-1-f4bug@amsat.org> References: <20220109170612.574104-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::433 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-block@nongnu.org, Christian Schoenebeck , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Cameron Esfahani , Roman Bolshakov , Alexander Graf , Gerd Hoffmann , Akihiko Odaki , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" When building on macOS 12 we get: audio/coreaudio.c:50:5: error: 'kAudioObjectPropertyElementMaster' is deprecated: first deprecated in macOS 12.0 [-Werror,-Wdeprecated-declarations] kAudioObjectPropertyElementMaster ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ kAudioObjectPropertyElementMain /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/System/Library/Frameworks/CoreAudio.framework/Headers/AudioHardwareBase.h:208:5: note: 'kAudioObjectPropertyElementMaster' has been explicitly marked deprecated here kAudioObjectPropertyElementMaster API_DEPRECATED_WITH_REPLACEMENT("kAudioObjectPropertyElementMain", macos(10.0, 12.0), ios(2.0, 15.0), watchos(1.0, 8.0), tvos(9.0, 15.0)) = kAudioObjectPropertyElementMain ^ Use kAudioObjectPropertyElementMain (define it to kAudioObjectPropertyElementMaster on macOS < 12). Signed-off-by: Philippe Mathieu-Daudé --- audio/coreaudio.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index d8a21d3e507..c836bc9dd37 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -44,10 +44,14 @@ typedef struct coreaudioVoiceOut { bool enabled; } coreaudioVoiceOut; +#if !defined(MAC_OS_VERSION_12_0) +#define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster +#endif + static const AudioObjectPropertyAddress voice_addr = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; static OSStatus coreaudio_get_voice(AudioDeviceID *id) @@ -69,7 +73,7 @@ static OSStatus coreaudio_get_framesizerange(AudioDeviceID id, AudioObjectPropertyAddress addr = { kAudioDevicePropertyBufferFrameSizeRange, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; return AudioObjectGetPropertyData(id, @@ -86,7 +90,7 @@ static OSStatus coreaudio_get_framesize(AudioDeviceID id, UInt32 *framesize) AudioObjectPropertyAddress addr = { kAudioDevicePropertyBufferFrameSize, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; return AudioObjectGetPropertyData(id, @@ -103,7 +107,7 @@ static OSStatus coreaudio_set_framesize(AudioDeviceID id, UInt32 *framesize) AudioObjectPropertyAddress addr = { kAudioDevicePropertyBufferFrameSize, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; return AudioObjectSetPropertyData(id, @@ -121,7 +125,7 @@ static OSStatus coreaudio_set_streamformat(AudioDeviceID id, AudioObjectPropertyAddress addr = { kAudioDevicePropertyStreamFormat, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; return AudioObjectSetPropertyData(id, @@ -138,7 +142,7 @@ static OSStatus coreaudio_get_isrunning(AudioDeviceID id, UInt32 *result) AudioObjectPropertyAddress addr = { kAudioDevicePropertyDeviceIsRunning, kAudioDevicePropertyScopeOutput, - kAudioObjectPropertyElementMaster + kAudioObjectPropertyElementMain }; return AudioObjectGetPropertyData(id,