diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2023-06-07 01:57:57 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-06-07 18:43:11 +0000 |
commit | 7ff9350718d8cc8cb7e869f11f3be7f1660ced43 (patch) | |
tree | a3eb915feab9ba4b39447b7ce4fe3835faf6c646 /src | |
parent | 66e2f10c758b9edc040106d17c81c4a4058e369d (diff) |
Replace Q_OS_OSX with Q_OS_MACOS
Change-Id: I23fab7187d527bac1376a32d6b25a4ff01470944
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 56024013d898696b209ac1c74ec2abe638675446)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
-rw-r--r-- | src/multimedia/darwin/qdarwinaudiosink.mm | 10 | ||||
-rw-r--r-- | src/multimedia/darwin/qdarwinaudiosink_p.h | 2 | ||||
-rw-r--r-- | src/multimedia/darwin/qdarwinaudiosource.mm | 12 | ||||
-rw-r--r-- | src/multimedia/darwin/qdarwinaudiosource_p.h | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/multimedia/darwin/qdarwinaudiosink.mm b/src/multimedia/darwin/qdarwinaudiosink.mm index 39063f1ca..38563a9e7 100644 --- a/src/multimedia/darwin/qdarwinaudiosink.mm +++ b/src/multimedia/darwin/qdarwinaudiosink.mm @@ -13,7 +13,7 @@ #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) # include <AudioUnit/AudioComponent.h> #endif @@ -358,7 +358,7 @@ void QDarwinAudioSink::setVolume(qreal volume) if (!m_isOpen) return; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) //on OS X the volume can be set directly on the AudioUnit if (AudioUnitSetParameter(m_audioUnit, kHALOutputParam_Volume, @@ -473,7 +473,7 @@ bool QDarwinAudioSink::open() AudioComponentDescription componentDescription; componentDescription.componentType = kAudioUnitType_Output; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) componentDescription.componentSubType = kAudioUnitSubType_HALOutput; #else componentDescription.componentSubType = kAudioUnitSubType_RemoteIO; @@ -508,7 +508,7 @@ bool QDarwinAudioSink::open() return false; } -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) //Set Audio Device if (AudioUnitSetProperty(m_audioUnit, kAudioOutputUnitProperty_CurrentDevice, @@ -539,7 +539,7 @@ bool QDarwinAudioSink::open() // Allocate buffer UInt32 numberOfFrames = 0; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) size = sizeof(UInt32); if (AudioUnitGetProperty(m_audioUnit, kAudioDevicePropertyBufferFrameSize, diff --git a/src/multimedia/darwin/qdarwinaudiosink_p.h b/src/multimedia/darwin/qdarwinaudiosink_p.h index b0ae4c05e..998f86e28 100644 --- a/src/multimedia/darwin/qdarwinaudiosink_p.h +++ b/src/multimedia/darwin/qdarwinaudiosink_p.h @@ -16,7 +16,7 @@ #include <private/qaudiosystem_p.h> -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) # include <CoreAudio/CoreAudio.h> #endif #include <AudioUnit/AudioUnit.h> diff --git a/src/multimedia/darwin/qdarwinaudiosource.mm b/src/multimedia/darwin/qdarwinaudiosource.mm index 6ff52faa9..04ed49f6e 100644 --- a/src/multimedia/darwin/qdarwinaudiosource.mm +++ b/src/multimedia/darwin/qdarwinaudiosource.mm @@ -7,7 +7,7 @@ #include "qdarwinmediadevices_p.h" #include <qmediadevices.h> -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) # include <AudioUnit/AudioComponent.h> #endif @@ -454,7 +454,7 @@ bool QDarwinAudioSource::open() AudioComponentDescription componentDescription; componentDescription.componentType = kAudioUnitType_Output; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) componentDescription.componentSubType = kAudioUnitSubType_HALOutput; #else componentDescription.componentSubType = kAudioUnitSubType_RemoteIO; @@ -513,7 +513,7 @@ bool QDarwinAudioSource::open() return false; } -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) //Set Audio Device if (AudioUnitSetProperty(m_audioUnit, kAudioOutputUnitProperty_CurrentDevice, @@ -529,7 +529,7 @@ bool QDarwinAudioSource::open() //set format m_streamFormat = CoreAudioUtils::toAudioStreamBasicDescription(m_audioFormat); -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) UInt32 size = 0; if (m_audioFormat == m_audioDeviceInfo.preferredFormat()) { @@ -542,7 +542,7 @@ bool QDarwinAudioSource::open() 1, &m_deviceFormat, sizeof(m_deviceFormat)); -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) } else { size = sizeof(m_deviceFormat); if (AudioUnitGetProperty(m_audioUnit, @@ -569,7 +569,7 @@ bool QDarwinAudioSource::open() //setup buffers UInt32 numberOfFrames; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) size = sizeof(UInt32); if (AudioUnitGetProperty(m_audioUnit, kAudioDevicePropertyBufferFrameSize, diff --git a/src/multimedia/darwin/qdarwinaudiosource_p.h b/src/multimedia/darwin/qdarwinaudiosource_p.h index cb9ab63d4..87c3c1070 100644 --- a/src/multimedia/darwin/qdarwinaudiosource_p.h +++ b/src/multimedia/darwin/qdarwinaudiosource_p.h @@ -226,7 +226,7 @@ private: QAudioFormat m_audioFormat; QIODevice *m_audioIO; AudioUnit m_audioUnit; -#if defined(Q_OS_OSX) +#if defined(Q_OS_MACOS) AudioDeviceID m_audioDeviceId; #endif Float64 m_clockFrequency; |