From 20094c7c07e560205720ec6fe571a7bba3cb1bf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 27 Sep 2017 10:24:05 +0200
Subject: [PATCH] coreaudio: update to new error-checking macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: I01d69f1bc9786c0b87e5fc193bf341ce3d981d21
Reviewed-by: Anthony Léonard <anthony.leonard@savoirfairelinux.com>
---
src/media/audio/coreaudio/audiodevice.cpp | 12 ++++++------
src/media/audio/coreaudio/corelayer.cpp | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/media/audio/coreaudio/audiodevice.cpp b/src/media/audio/coreaudio/audiodevice.cpp
index bf0ac541a2..a79a45b540 100644
--- a/src/media/audio/coreaudio/audiodevice.cpp
+++ b/src/media/audio/coreaudio/audiodevice.cpp
@@ -48,7 +48,7 @@ void AudioDevice::init(AudioDeviceID devid, bool isInput)
theScope,
0 }; // channel
- verify_noerr(AudioObjectGetPropertyData(id_,
+ __Verify_noErr(AudioObjectGetPropertyData(id_,
&theAddress,
0,
NULL,
@@ -59,7 +59,7 @@ void AudioDevice::init(AudioDeviceID devid, bool isInput)
propsize = sizeof(UInt32);
theAddress.mSelector = kAudioDevicePropertyBufferFrameSize;
- verify_noerr(AudioObjectGetPropertyData(id_,
+ __Verify_noErr(AudioObjectGetPropertyData(id_,
&theAddress,
0,
NULL,
@@ -69,7 +69,7 @@ void AudioDevice::init(AudioDeviceID devid, bool isInput)
propsize = sizeof(AudioStreamBasicDescription);
theAddress.mSelector = kAudioDevicePropertyStreamFormat;
- verify_noerr(AudioObjectGetPropertyData(id_,
+ __Verify_noErr(AudioObjectGetPropertyData(id_,
&theAddress,
0,
NULL,
@@ -95,14 +95,14 @@ void AudioDevice::setBufferSize(UInt32 size)
theScope,
0 }; // channel
- verify_noerr(AudioObjectSetPropertyData(id_,
+ __Verify_noErr(AudioObjectSetPropertyData(id_,
&theAddress,
0,
NULL,
propsize,
&size));
- verify_noerr(AudioObjectGetPropertyData(id_,
+ __Verify_noErr(AudioObjectGetPropertyData(id_,
&theAddress,
0,
NULL,
@@ -160,7 +160,7 @@ std::string AudioDevice::getName() const
theScope,
0 }; // channel
- verify_noerr(AudioObjectGetPropertyData(id_,
+ __Verify_noErr(AudioObjectGetPropertyData(id_,
&theAddress,
0,
NULL,
diff --git a/src/media/audio/coreaudio/corelayer.cpp b/src/media/audio/coreaudio/corelayer.cpp
index 8571a5b418..c31c27e324 100644
--- a/src/media/audio/coreaudio/corelayer.cpp
+++ b/src/media/audio/coreaudio/corelayer.cpp
@@ -415,7 +415,7 @@ CoreLayer::getDeviceList(bool getCapture) const
kAudioObjectPropertyElementMaster
};
- verify_noerr(AudioObjectGetPropertyDataSize(kAudioObjectSystemObject,
+ __Verify_noErr(AudioObjectGetPropertyDataSize(kAudioObjectSystemObject,
&theAddress,
0,
nullptr,
@@ -424,7 +424,7 @@ CoreLayer::getDeviceList(bool getCapture) const
std::size_t nDevices = propsize / sizeof(AudioDeviceID);
auto devids = std::vector<AudioDeviceID>(nDevices);
- verify_noerr(AudioObjectGetPropertyData(kAudioObjectSystemObject,
+ __Verify_noErr(AudioObjectGetPropertyData(kAudioObjectSystemObject,
&theAddress,
0,
nullptr,
--
GitLab