From nobody Wed Feb 5 18:00:19 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1737695987; cv=none; d=zohomail.com; s=zohoarc; b=BaKtp8bM8905OrlqaGPNMUcDyOnOdHN+yIEeFT13nv+ylByFzu9kY97ZZcnEnm1+JVBRYXAMnaIbj4GJ+e0MjSOCa76nIugtkFPJSVLzaYpSRdB7c/5mhRSxOVU5+0WC3qktMb/7oq6eJbtGYtw9jJQH7D2rI7hmPqU7NkY/w5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737695987; 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=eNvKszHorz0182xJOZsYgnwbAowCh/yan25Vyw/F0BQ=; b=ZFr41e0pPm0pt0n3kHq/5Ei2LVDYdO+odIjQuYlYTSfbGw8R0OCIuIAuyHR51uEGH/69qjGvOLBLChMIrQD4oWuI7qobgT0nF3/pWdjmmia9lKLN0ofH2yF3kWkBPcMKwj8ZGjZhFkfemLeO9zNfTQQyWJ2As6tATMC25O2ubYc= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1737695987448506.6076234929277; Thu, 23 Jan 2025 21:19:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tbC6J-0007jQ-6Y; Fri, 24 Jan 2025 00:19:27 -0500 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 1tbC6F-0007gV-7k for qemu-devel@nongnu.org; Fri, 24 Jan 2025 00:19:23 -0500 Received: from mail-il1-x12c.google.com ([2607:f8b0:4864:20::12c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tbC6C-0001Js-Jv for qemu-devel@nongnu.org; Fri, 24 Jan 2025 00:19:23 -0500 Received: by mail-il1-x12c.google.com with SMTP id e9e14a558f8ab-3ce886a2d5bso12731515ab.1 for ; Thu, 23 Jan 2025 21:19:19 -0800 (PST) Received: from localhost ([157.82.207.107]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2f7ffa6b2bdsm670460a91.25.2025.01.23.21.12.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 Jan 2025 21:12:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1737695959; x=1738300759; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=eNvKszHorz0182xJOZsYgnwbAowCh/yan25Vyw/F0BQ=; b=WUilaJodiSCqSMSngYzZNYrDEQWUFy+W+2TzL5XVsgBKlrtaEkdlEXKMCgE8soZHTj dTClqF8iMhtqAFkbiJY0Weha/oYsveay9VJld7JrgFPo/EXIsoFCWHv3lzbpFV7FG0D+ I2EQu495wUbnB8nF5rT9Uo9tjDBQLSb86F953BKcev2A3+hiBmMHX3F7/7sUAr2LIOv+ q2BRVqC0wqU2IxvmsEfvFh2mgVBQnfo+pvgxwjqVV5GYaicPYlwCsFulk5B0S0j3WBk/ Ls4e1UE800a+cNep/ttnH7AaeOFecb040W0Hhd6QBTvJurPRrmLdTOO1R89RLhvfw4O/ HMSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737695959; x=1738300759; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eNvKszHorz0182xJOZsYgnwbAowCh/yan25Vyw/F0BQ=; b=s8n0iLmB6fgfVfw2qrXBKePSoNOdhmf4uz4ZLmgAtCHCL52oO7oyzMMR9zkozwk0HD ZlKEyUrMRQ75q265e260gu0UCTegAZaP8iL1gk//Y2qFgKZHVMVAaxA9iTOieIloclPQ DWOmaL7x8O/EhBRJRvQJ5vVk459H2q7cUAcaf0bJURaNrW5DQo9GHtFDenWFtrt0Ko0p J5bq1uysPpUQhYQ8jFgQx1B03V6HqIb9jiTjqXbsWdM4awlj+38EjgGwfU5EoGGbqKIf Nr8QUHlyITSoFnub/ri+zy+zlV/EJcJ/+7wsIyW2jKijAYJ6hATwi6xIwJlVOdGj3UY5 Kbbw== X-Gm-Message-State: AOJu0YxuX9tcKeCOa1MHLOEOeizAgiHMtUxfUvG5FjVC6YPECoExrTal SL7iHFTlLM3V36APxJCzUFUbgLm/Uuru7vWfdPXTllyyN2BG9cjEXfzqY14D5LlFTUPeqxUiu4u XMCg= X-Gm-Gg: ASbGncueaHZ9SddqG84M2b6sNVH8oJiM4ceUq9uKE5g6ORz7rgxPWCZ+QDl9Htk/Co9 DTkRSOMGBvaspjn1QM7r87W4b12gnYSoREQYlZkgM/Zps1MY0yuRj7oppbObEV2+j7IkGhkOPnE EAPyrhudNclXH7jsdIBazkj9Nf5rDVumUj67BWb4YAnNcmO95msfMM9k74h4EbuxAV0fvIAcgJC /iQFjvPfXicw/V8vxL4c76d8AW111VX1DIFwwlAWqYCJEavbp2uf25fN5wSgZfzs1ZN6wgOpAhm 7Pmeaue1 X-Google-Smtp-Source: AGHT+IFjT/qSMpIrZ/uKaguf5hPwe7rEFQ70dLjYSNlV1hvnQdFv+uJxVNWPVquUcrYf8Ib0pH8voA== X-Received: by 2002:a17:90b:38d0:b0:2ee:d35c:3996 with SMTP id 98e67ed59e1d1-2f782d972f5mr40983865a91.31.1737695545726; Thu, 23 Jan 2025 21:12:25 -0800 (PST) From: Akihiko Odaki Date: Fri, 24 Jan 2025 14:12:06 +0900 Subject: [PATCH v7 3/6] coreaudio: Improve naming MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250124-coreaudio-v7-3-9d9a4d91db37@daynix.com> References: <20250124-coreaudio-v7-0-9d9a4d91db37@daynix.com> In-Reply-To: <20250124-coreaudio-v7-0-9d9a4d91db37@daynix.com> To: Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Christian Schoenebeck , BALATON Zoltan Cc: qemu-devel@nongnu.org, devel@daynix.com, Akihiko Odaki X-Mailer: b4 0.14.2 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=2607:f8b0:4864:20::12c; envelope-from=akihiko.odaki@daynix.com; helo=mail-il1-x12c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1737695990741019100 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: Christian Schoenebeck --- audio/coreaudio.m | 193 +++++++++++++++++++++++++++-----------------------= ---- 1 file changed, 98 insertions(+), 95 deletions(-) diff --git a/audio/coreaudio.m b/audio/coreaudio.m index 04e8ac59f4572c1e5fb7dc4f04f5e21520507ab5..6f170a909983b2a5c6abd6fc04c= 6c3f32828c10c 100644 --- a/audio/coreaudio.m +++ b/audio/coreaudio.m @@ -33,37 +33,37 @@ #define AUDIO_CAP "coreaudio" #include "audio_int.h" =20 -typedef struct coreaudioVoiceOut { +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 { @@ -80,7 +80,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 { @@ -97,7 +97,7 @@ static OSStatus coreaudio_get_framesize(AudioDeviceID id,= 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 { @@ -114,8 +114,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 { @@ -132,7 +132,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 { @@ -242,7 +242,8 @@ static void G_GNUC_PRINTF(3, 4) coreaudio_logerr2( #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 @@ -255,7 +256,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 @@ -268,20 +270,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), @@ -297,7 +299,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, @@ -306,33 +308,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 @@ -348,16 +350,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) { OSStatus status; - AudioValueRange frameRange; + AudioValueRange framerange; =20 - AudioStreamBasicDescription streamBasicDescription =3D { + AudioStreamBasicDescription stream_basic_description =3D { .mBitsPerChannel =3D core->hw.info.bits, .mBytesPerFrame =3D core->hw.info.bytes_per_frame, .mBytesPerPacket =3D core->hw.info.bytes_per_frame, @@ -368,20 +370,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\n"); return status; } - if (core->outputDeviceID =3D=3D kAudioDeviceUnknown) { + if (core->device_id =3D=3D kAudioDeviceUnknown) { dolog("Could not initialize playback - Unknown Audiodevice\n"); 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, + &framerange); if (status =3D=3D kAudioHardwareBadObjectError) { return 0; } @@ -391,32 +393,32 @@ static OSStatus init_out_device(coreaudioVoiceOut *co= re) return status; } =20 - if (frameRange.mMinimum > core->frameSizeSetting) { - core->audioDevicePropertyBufferFrameSize =3D frameRange.mMinimum; - dolog("warning: Upsizing Buffer Frames to %f\n", frameRange.mMinim= um); - } else if (frameRange.mMaximum < core->frameSizeSetting) { - core->audioDevicePropertyBufferFrameSize =3D frameRange.mMaximum; - dolog("warning: Downsizing Buffer Frames to %f\n", frameRange.mMax= imum); + if (framerange.mMinimum > core->frame_size_setting) { + core->device_frame_size =3D framerange.mMinimum; + dolog("warning: Upsizing Buffer Frames to %f\n", framerange.mMinim= um); + } else if (framerange.mMaximum < core->frame_size_setting) { + core->device_frame_size =3D framerange.mMaximum; + dolog("warning: Downsizing Buffer Frames to %f\n", framerange.mMax= imum); } 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 "\n", - (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; } @@ -425,19 +427,19 @@ static OSStatus init_out_device(coreaudioVoiceOut *co= re) "Could not get device buffer frame size\= n"); 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\n", - streamBasicDescription.mSampleRate); - core->outputDeviceID =3D kAudioDeviceUnknown; + stream_basic_description.mSampleRate); + core->device_id =3D kAudioDeviceUnknown; return status; } =20 @@ -452,8 +454,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) { @@ -461,20 +463,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\n"); - 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, @@ -482,7 +484,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\n"); } @@ -490,20 +492,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\n"); } - 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, @@ -516,7 +518,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\n"); } @@ -524,7 +526,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\n"); @@ -534,22 +536,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(); @@ -560,7 +562,7 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct au= dsettings *as, void *drv_opaque) { OSStatus status; - coreaudioVoiceOut *core =3D (coreaudioVoiceOut *)hw; + CoreaudioVoiceOut *core =3D (CoreaudioVoiceOut *)hw; int err; Audiodev *dev =3D drv_opaque; AudiodevCoreaudioPerDirectionOptions *cpdo =3D dev->u.coreaudio.out; @@ -578,13 +580,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, @@ -594,8 +597,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, @@ -612,11 +615,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\n"); @@ -633,10 +636,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 *coreaudio_audio_init(Audiodev *dev, Error **errp) @@ -670,7 +673,7 @@ static void coreaudio_audio_fini(void *opaque) .pcm_ops =3D &coreaudio_pcm_ops, .max_voices_out =3D 1, .max_voices_in =3D 0, - .voice_size_out =3D sizeof(coreaudioVoiceOut), + .voice_size_out =3D sizeof(CoreaudioVoiceOut), .voice_size_in =3D 0 }; =20 --=20 2.48.1