From nobody Tue Apr 7 00:01:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773768075; cv=none; d=zohomail.com; s=zohoarc; b=AsW8ufgZ2utdtwfnCV9REKBpEy8m6Gn0qAigOW9e9nKBGY5kThGrYe+Qw0dQC0fxah5Hf3fo/j+t7WjTY0fVmilwlWlhGy5+kdcNzPkHuiMsTdnMAnnKOup5jNXI3JEVsxcWiyhYUdF1h2Yo/PJ9Vk2TyAdb4lmJjDgoq41+4YY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773768075; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZELC7n7zbnFWjRmMkg6vBGd/m+uJfldpdetbA43ORNk=; b=nMzgcHsowT0EfXnARHSFgI6WBMvOS6XJRUzL8WD+Tabb2S6DN8GCEKzT4IIkHqwveAnHFLlvyGK10db2tM7HHcGTEvfzFx9MlhzFWB0KgKmm0/+58nnnlt1BZKRDVXQ3byzqx3A0SoV06Jh31wM6uApYsfkMnNyiXx/ViBNqOEQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177376807530315.836421446993995; Tue, 17 Mar 2026 10:21:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2Y6O-0002y6-RS; Tue, 17 Mar 2026 13:21:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2Y6E-0002eA-0A for qemu-devel@nongnu.org; Tue, 17 Mar 2026 13:20:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2Y6B-0005f2-Dd for qemu-devel@nongnu.org; Tue, 17 Mar 2026 13:20:57 -0400 Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-128-b-z7PoDGPiqWZ_QOYLmxsQ-1; Tue, 17 Mar 2026 13:20:50 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E369018005BE; Tue, 17 Mar 2026 17:20:48 +0000 (UTC) Received: from localhost (unknown [10.44.22.4]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 552AC30001A1; Tue, 17 Mar 2026 17:20:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773768054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZELC7n7zbnFWjRmMkg6vBGd/m+uJfldpdetbA43ORNk=; b=io/si4leYCCzGlQoR0b/W7oDNXjNrwQ1L1cRPj42xDymW1aQO4N2PZ+48YdzdWgVWUqH5H qusPRAY0IBkdgi2qHvD7ZZ1kaJGw+BtPn2mElLbLB3pNMw+RF8u8D5wCAn9cvBr+sqxzSw iWoUFdai2fbHsaHGLdxD57vW1BTnqts= X-MC-Unique: b-z7PoDGPiqWZ_QOYLmxsQ-1 X-Mimecast-MFC-AGG-ID: b-z7PoDGPiqWZ_QOYLmxsQ_1773768049 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Dmitry Osipenko , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" , Christian Schoenebeck , Ani Sinha , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Gerd Hoffmann , Zhao Liu , Marcel Apfelbaum , Yanan Wang , Akihiko Odaki Subject: [PULL 13/16] coreaudio: Improve naming Date: Tue, 17 Mar 2026 21:19:13 +0400 Message-ID: <20260317171916.438575-14-marcandre.lureau@redhat.com> In-Reply-To: <20260317171916.438575-1-marcandre.lureau@redhat.com> References: <20260317171916.438575-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773768077209158500 From: Akihiko Odaki coreaudio had names that are not conforming to QEMU codding style. coreaudioVoiceOut also had some members that are prefixed with redundant words like "output" or "audio". Global names included "out" to tell they are specific to output devices, but this rule was not completely enforced. The frame size had three different names "frameSize", "bufferFrameSize", and "frameCount". Replace identifiers to fix these problems. Signed-off-by: Akihiko Odaki Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20260304-coreaudio-v8-3-bf1d40731e73@rsg.ci.i.u-tokyo.ac.jp> --- audio/coreaudio.m | 188 +++++++++++++++++++++++----------------------- 1 file changed, 95 insertions(+), 93 deletions(-) diff --git a/audio/coreaudio.m b/audio/coreaudio.m index bc9ab7477b6..736227eb2b7 100644 --- a/audio/coreaudio.m +++ b/audio/coreaudio.m @@ -43,34 +43,34 @@ typedef struct coreaudioVoiceOut { HWVoiceOut hw; pthread_mutex_t buf_mutex; - AudioDeviceID outputDeviceID; - int frameSizeSetting; - uint32_t bufferCount; - UInt32 audioDevicePropertyBufferFrameSize; + AudioDeviceID device_id; + int frame_size_setting; + uint32_t buffer_count; + UInt32 device_frame_size; AudioDeviceIOProcID ioprocid; bool enabled; -} coreaudioVoiceOut; +} CoreaudioVoiceOut; =20 -static const AudioObjectPropertyAddress voice_addr =3D { +static const AudioObjectPropertyAddress voice_out_addr =3D { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain }; =20 -static OSStatus coreaudio_get_voice(AudioDeviceID *id) +static OSStatus coreaudio_get_voice_out(AudioDeviceID *id) { UInt32 size =3D sizeof(*id); =20 return AudioObjectGetPropertyData(kAudioObjectSystemObject, - &voice_addr, + &voice_out_addr, 0, NULL, &size, id); } =20 -static OSStatus coreaudio_get_framesizerange(AudioDeviceID id, - AudioValueRange *framerange) +static OSStatus coreaudio_get_out_framesizerange(AudioDeviceID id, + AudioValueRange *frameran= ge) { UInt32 size =3D sizeof(*framerange); AudioObjectPropertyAddress addr =3D { @@ -87,7 +87,7 @@ static OSStatus coreaudio_get_framesizerange(AudioDeviceI= D id, framerange); } =20 -static OSStatus coreaudio_get_framesize(AudioDeviceID id, UInt32 *framesiz= e) +static OSStatus coreaudio_get_out_framesize(AudioDeviceID id, UInt32 *fram= esize) { UInt32 size =3D sizeof(*framesize); AudioObjectPropertyAddress addr =3D { @@ -104,7 +104,7 @@ static OSStatus coreaudio_get_framesize(AudioDeviceID i= d, UInt32 *framesize) framesize); } =20 -static OSStatus coreaudio_set_framesize(AudioDeviceID id, UInt32 *framesiz= e) +static OSStatus coreaudio_set_out_framesize(AudioDeviceID id, UInt32 *fram= esize) { UInt32 size =3D sizeof(*framesize); AudioObjectPropertyAddress addr =3D { @@ -121,8 +121,8 @@ static OSStatus coreaudio_set_framesize(AudioDeviceID i= d, UInt32 *framesize) framesize); } =20 -static OSStatus coreaudio_set_streamformat(AudioDeviceID id, - AudioStreamBasicDescription *d) +static OSStatus coreaudio_set_out_streamformat(AudioDeviceID id, + AudioStreamBasicDescription= *d) { UInt32 size =3D sizeof(*d); AudioObjectPropertyAddress addr =3D { @@ -139,7 +139,7 @@ static OSStatus coreaudio_set_streamformat(AudioDeviceI= D id, d); } =20 -static OSStatus coreaudio_get_isrunning(AudioDeviceID id, UInt32 *result) +static OSStatus coreaudio_get_out_isrunning(AudioDeviceID id, UInt32 *resu= lt) { UInt32 size =3D sizeof(*result); AudioObjectPropertyAddress addr =3D { @@ -243,7 +243,8 @@ static void G_GNUC_PRINTF(3, 4) coreaudio_logerr2(OSSta= tus status, #define coreaudio_playback_logerr(status, ...) \ coreaudio_logerr2(status, "playback", __VA_ARGS__) =20 -static int coreaudio_buf_lock(coreaudioVoiceOut *core, const char *fn_name) +static int coreaudio_voice_out_buf_lock(CoreaudioVoiceOut *core, + const char *fn_name) { int err; =20 @@ -256,7 +257,8 @@ static int coreaudio_buf_lock(coreaudioVoiceOut *core, = const char *fn_name) return 0; } =20 -static int coreaudio_buf_unlock(coreaudioVoiceOut *core, const char *fn_na= me) +static int coreaudio_voice_out_buf_unlock(CoreaudioVoiceOut *core, + const char *fn_name) { int err; =20 @@ -269,20 +271,20 @@ static int coreaudio_buf_unlock(coreaudioVoiceOut *co= re, const char *fn_name) return 0; } =20 -#define COREAUDIO_WRAPPER_FUNC(name, ret_type, args_decl, args) \ - static ret_type glue(coreaudio_, name)args_decl \ - { \ - coreaudioVoiceOut *core =3D (coreaudioVoiceOut *)hw; \ - ret_type ret; \ - \ - if (coreaudio_buf_lock(core, "coreaudio_" #name)) { \ - return 0; \ - } \ - \ - ret =3D glue(audio_generic_, name)args; \ - \ - coreaudio_buf_unlock(core, "coreaudio_" #name); \ - return ret; \ +#define COREAUDIO_WRAPPER_FUNC(name, ret_type, args_decl, args) \ + static ret_type glue(coreaudio_, name)args_decl \ + { \ + CoreaudioVoiceOut *core =3D (CoreaudioVoiceOut *)hw; \ + ret_type ret; \ + \ + if (coreaudio_voice_out_buf_lock(core, "coreaudio_" #name)) { \ + return 0; \ + } \ + \ + ret =3D glue(audio_generic_, name)args; \ + \ + coreaudio_voice_out_buf_unlock(core, "coreaudio_" #name); \ + return ret; \ } COREAUDIO_WRAPPER_FUNC(buffer_get_free, size_t, (HWVoiceOut *hw), (hw)) COREAUDIO_WRAPPER_FUNC(get_buffer_out, void *, (HWVoiceOut *hw, size_t *si= ze), @@ -298,7 +300,7 @@ static ret_type glue(coreaudio_, name)args_decl = \ * callback to feed audiooutput buffer. called without BQL. * allowed to lock "buf_mutex", but disallowed to have any other locks. */ -static OSStatus audioDeviceIOProc( +static OSStatus out_device_ioproc( AudioDeviceID inDevice, const AudioTimeStamp *inNow, const AudioBufferList *inInputData, @@ -307,33 +309,33 @@ static OSStatus audioDeviceIOProc( const AudioTimeStamp *inOutputTime, void *hwptr) { - UInt32 frameCount, pending_frames; + UInt32 frame_size, pending_frames; void *out =3D outOutputData->mBuffers[0].mData; HWVoiceOut *hw =3D hwptr; - coreaudioVoiceOut *core =3D hwptr; + CoreaudioVoiceOut *core =3D hwptr; size_t len; =20 - if (coreaudio_buf_lock(core, "audioDeviceIOProc")) { + if (coreaudio_voice_out_buf_lock(core, "out_device_ioproc")) { inInputTime =3D 0; return 0; } =20 - if (inDevice !=3D core->outputDeviceID) { - coreaudio_buf_unlock(core, "audioDeviceIOProc(old device)"); + if (inDevice !=3D core->device_id) { + coreaudio_voice_out_buf_unlock(core, "out_device_ioproc(old device= )"); return 0; } =20 - frameCount =3D core->audioDevicePropertyBufferFrameSize; + frame_size =3D core->device_frame_size; pending_frames =3D hw->pending_emul / hw->info.bytes_per_frame; =20 /* if there are not enough samples, set signal and return */ - if (pending_frames < frameCount) { + if (pending_frames < frame_size) { inInputTime =3D 0; - coreaudio_buf_unlock(core, "audioDeviceIOProc(empty)"); + coreaudio_voice_out_buf_unlock(core, "out_device_ioproc(empty)"); return 0; } =20 - len =3D frameCount * hw->info.bytes_per_frame; + len =3D frame_size * hw->info.bytes_per_frame; while (len) { size_t write_len, start; =20 @@ -349,16 +351,16 @@ static OSStatus audioDeviceIOProc( out +=3D write_len; } =20 - coreaudio_buf_unlock(core, "audioDeviceIOProc"); + coreaudio_voice_out_buf_unlock(core, "out_device_ioproc"); return 0; } =20 -static OSStatus init_out_device(coreaudioVoiceOut *core) +static OSStatus init_out_device(CoreaudioVoiceOut *core) { + AudioValueRange value_range; OSStatus status; - AudioValueRange frameRange; =20 - AudioStreamBasicDescription streamBasicDescription =3D { + AudioStreamBasicDescription stream_basic_description =3D { .mBitsPerChannel =3D audio_format_bits(core->hw.info.af), .mBytesPerFrame =3D core->hw.info.bytes_per_frame, .mBytesPerPacket =3D core->hw.info.bytes_per_frame, @@ -369,21 +371,20 @@ static OSStatus init_out_device(coreaudioVoiceOut *co= re) .mSampleRate =3D core->hw.info.freq }; =20 - status =3D coreaudio_get_voice(&core->outputDeviceID); + status =3D coreaudio_get_voice_out(&core->device_id); if (status !=3D kAudioHardwareNoError) { coreaudio_playback_logerr(status, "Could not get default output device"); return status; } - if (core->outputDeviceID =3D=3D kAudioDeviceUnknown) { + if (core->device_id =3D=3D kAudioDeviceUnknown) { error_report("coreaudio: Could not initialize playback: " "Unknown audio device"); return status; } =20 /* get minimum and maximum buffer frame sizes */ - status =3D coreaudio_get_framesizerange(core->outputDeviceID, - &frameRange); + status =3D coreaudio_get_out_framesizerange(core->device_id, &value_ra= nge); if (status =3D=3D kAudioHardwareBadObjectError) { return 0; } @@ -393,34 +394,34 @@ static OSStatus init_out_device(coreaudioVoiceOut *co= re) return status; } =20 - if (frameRange.mMinimum > core->frameSizeSetting) { - core->audioDevicePropertyBufferFrameSize =3D frameRange.mMinimum; + if (value_range.mMinimum > core->frame_size_setting) { + core->device_frame_size =3D value_range.mMinimum; warn_report("coreaudio: Upsizing buffer frames to %f", - frameRange.mMinimum); - } else if (frameRange.mMaximum < core->frameSizeSetting) { - core->audioDevicePropertyBufferFrameSize =3D frameRange.mMaximum; + value_range.mMinimum); + } else if (value_range.mMaximum < core->frame_size_setting) { + core->device_frame_size =3D value_range.mMaximum; warn_report("coreaudio: Downsizing buffer frames to %f", - frameRange.mMaximum); + value_range.mMaximum); } else { - core->audioDevicePropertyBufferFrameSize =3D core->frameSizeSettin= g; + core->device_frame_size =3D core->frame_size_setting; } =20 /* set Buffer Frame Size */ - status =3D coreaudio_set_framesize(core->outputDeviceID, - &core->audioDevicePropertyBufferFrame= Size); + status =3D coreaudio_set_out_framesize(core->device_id, + &core->device_frame_size); if (status =3D=3D kAudioHardwareBadObjectError) { return 0; } if (status !=3D kAudioHardwareNoError) { coreaudio_playback_logerr(status, "Could not set device buffer frame size = %" PRIu32, - (uint32_t)core->audioDevicePropertyBuffe= rFrameSize); + (uint32_t)core->device_frame_size); return status; } =20 /* get Buffer Frame Size */ - status =3D coreaudio_get_framesize(core->outputDeviceID, - &core->audioDevicePropertyBufferFrame= Size); + status =3D coreaudio_get_out_framesize(core->device_id, + &core->device_frame_size); if (status =3D=3D kAudioHardwareBadObjectError) { return 0; } @@ -429,19 +430,19 @@ static OSStatus init_out_device(coreaudioVoiceOut *co= re) "Could not get device buffer frame size"= ); return status; } - core->hw.samples =3D core->bufferCount * core->audioDevicePropertyBuff= erFrameSize; + core->hw.samples =3D core->buffer_count * core->device_frame_size; =20 /* set Samplerate */ - status =3D coreaudio_set_streamformat(core->outputDeviceID, - &streamBasicDescription); + status =3D coreaudio_set_out_streamformat(core->device_id, + &stream_basic_description); if (status =3D=3D kAudioHardwareBadObjectError) { return 0; } if (status !=3D kAudioHardwareNoError) { coreaudio_playback_logerr(status, "Could not set samplerate %lf", - streamBasicDescription.mSampleRate); - core->outputDeviceID =3D kAudioDeviceUnknown; + stream_basic_description.mSampleRate); + core->device_id =3D kAudioDeviceUnknown; return status; } =20 @@ -456,8 +457,8 @@ static OSStatus init_out_device(coreaudioVoiceOut *core) * with the callers of AudioObjectGetPropertyData. */ core->ioprocid =3D NULL; - status =3D AudioDeviceCreateIOProcID(core->outputDeviceID, - audioDeviceIOProc, + status =3D AudioDeviceCreateIOProcID(core->device_id, + out_device_ioproc, &core->hw, &core->ioprocid); if (status =3D=3D kAudioHardwareBadDeviceError) { @@ -465,20 +466,20 @@ static OSStatus init_out_device(coreaudioVoiceOut *co= re) } if (status !=3D kAudioHardwareNoError || core->ioprocid =3D=3D NULL) { coreaudio_playback_logerr(status, "Could not set IOProc"); - core->outputDeviceID =3D kAudioDeviceUnknown; + core->device_id =3D kAudioDeviceUnknown; return status; } =20 return 0; } =20 -static void fini_out_device(coreaudioVoiceOut *core) +static void fini_out_device(CoreaudioVoiceOut *core) { OSStatus status; UInt32 isrunning; =20 /* stop playback */ - status =3D coreaudio_get_isrunning(core->outputDeviceID, &isrunning); + status =3D coreaudio_get_out_isrunning(core->device_id, &isrunning); if (status !=3D kAudioHardwareBadObjectError) { if (status !=3D kAudioHardwareNoError) { coreaudio_logerr(status, @@ -486,7 +487,7 @@ static void fini_out_device(coreaudioVoiceOut *core) } =20 if (isrunning) { - status =3D AudioDeviceStop(core->outputDeviceID, core->ioproci= d); + status =3D AudioDeviceStop(core->device_id, core->ioprocid); if (status !=3D kAudioHardwareBadDeviceError && status !=3D kA= udioHardwareNoError) { coreaudio_logerr(status, "Could not stop playback"); } @@ -494,20 +495,20 @@ static void fini_out_device(coreaudioVoiceOut *core) } =20 /* remove callback */ - status =3D AudioDeviceDestroyIOProcID(core->outputDeviceID, + status =3D AudioDeviceDestroyIOProcID(core->device_id, core->ioprocid); if (status !=3D kAudioHardwareBadDeviceError && status !=3D kAudioHard= wareNoError) { coreaudio_logerr(status, "Could not remove IOProc"); } - core->outputDeviceID =3D kAudioDeviceUnknown; + core->device_id =3D kAudioDeviceUnknown; } =20 -static void update_device_playback_state(coreaudioVoiceOut *core) +static void update_out_device_playback_state(CoreaudioVoiceOut *core) { OSStatus status; UInt32 isrunning; =20 - status =3D coreaudio_get_isrunning(core->outputDeviceID, &isrunning); + status =3D coreaudio_get_out_isrunning(core->device_id, &isrunning); if (status !=3D kAudioHardwareNoError) { if (status !=3D kAudioHardwareBadObjectError) { coreaudio_logerr(status, @@ -520,7 +521,7 @@ static void update_device_playback_state(coreaudioVoice= Out *core) if (core->enabled) { /* start playback */ if (!isrunning) { - status =3D AudioDeviceStart(core->outputDeviceID, core->ioproc= id); + status =3D AudioDeviceStart(core->device_id, core->ioprocid); if (status !=3D kAudioHardwareBadDeviceError && status !=3D kA= udioHardwareNoError) { coreaudio_logerr(status, "Could not resume playback"); } @@ -528,7 +529,7 @@ static void update_device_playback_state(coreaudioVoice= Out *core) } else { /* stop playback */ if (isrunning) { - status =3D AudioDeviceStop(core->outputDeviceID, + status =3D AudioDeviceStop(core->device_id, core->ioprocid); if (status !=3D kAudioHardwareBadDeviceError && status !=3D kA= udioHardwareNoError) { coreaudio_logerr(status, "Could not pause playback"); @@ -538,22 +539,22 @@ static void update_device_playback_state(coreaudioVoi= ceOut *core) } =20 /* called without BQL. */ -static OSStatus handle_voice_change( +static OSStatus handle_voice_out_change( AudioObjectID in_object_id, UInt32 in_number_addresses, const AudioObjectPropertyAddress *in_addresses, void *in_client_data) { - coreaudioVoiceOut *core =3D in_client_data; + CoreaudioVoiceOut *core =3D in_client_data; =20 bql_lock(); =20 - if (core->outputDeviceID) { + if (core->device_id) { fini_out_device(core); } =20 if (!init_out_device(core)) { - update_device_playback_state(core); + update_out_device_playback_state(core); } =20 bql_unlock(); @@ -563,7 +564,7 @@ static OSStatus handle_voice_change( static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as) { OSStatus status; - coreaudioVoiceOut *core =3D (coreaudioVoiceOut *)hw; + CoreaudioVoiceOut *core =3D (CoreaudioVoiceOut *)hw; int err; Audiodev *dev =3D hw->s->dev; AudiodevCoreaudioPerDirectionOptions *cpdo =3D dev->u.coreaudio.out; @@ -581,13 +582,14 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct = audsettings *as) as->fmt =3D AUDIO_FORMAT_F32; audio_pcm_init_info(&hw->info, as); =20 - core->frameSizeSetting =3D audio_buffer_frames( + core->frame_size_setting =3D audio_buffer_frames( qapi_AudiodevCoreaudioPerDirectionOptions_base(cpdo), as, 11610); =20 - core->bufferCount =3D cpdo->has_buffer_count ? cpdo->buffer_count : 4; + core->buffer_count =3D cpdo->has_buffer_count ? cpdo->buffer_count : 4; =20 status =3D AudioObjectAddPropertyListener(kAudioObjectSystemObject, - &voice_addr, handle_voice_chan= ge, + &voice_out_addr, + handle_voice_out_change, core); if (status !=3D kAudioHardwareNoError) { coreaudio_playback_logerr(status, @@ -597,8 +599,8 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct au= dsettings *as) =20 if (init_out_device(core)) { status =3D AudioObjectRemovePropertyListener(kAudioObjectSystemObj= ect, - &voice_addr, - handle_voice_change, + &voice_out_addr, + handle_voice_out_change, core); if (status !=3D kAudioHardwareNoError) { coreaudio_playback_logerr(status, @@ -615,11 +617,11 @@ static void coreaudio_fini_out (HWVoiceOut *hw) { OSStatus status; int err; - coreaudioVoiceOut *core =3D (coreaudioVoiceOut *)hw; + CoreaudioVoiceOut *core =3D (CoreaudioVoiceOut *)hw; =20 status =3D AudioObjectRemovePropertyListener(kAudioObjectSystemObject, - &voice_addr, - handle_voice_change, + &voice_out_addr, + handle_voice_out_change, core); if (status !=3D kAudioHardwareNoError) { coreaudio_logerr(status, "Could not remove voice property change l= istener"); @@ -636,10 +638,10 @@ static void coreaudio_fini_out (HWVoiceOut *hw) =20 static void coreaudio_enable_out(HWVoiceOut *hw, bool enable) { - coreaudioVoiceOut *core =3D (coreaudioVoiceOut *)hw; + CoreaudioVoiceOut *core =3D (CoreaudioVoiceOut *)hw; =20 core->enabled =3D enable; - update_device_playback_state(core); + update_out_device_playback_state(core); } =20 static void audio_coreaudio_class_init(ObjectClass *klass, const void *dat= a) --=20 2.53.0