mirror of
https://github.com/feather-wallet/feather.git
synced 2024-12-23 12:09:50 +00:00
56 lines
2.9 KiB
Diff
56 lines
2.9 KiB
Diff
|
diff --git a/src/multimedia/darwin/qdarwinmediadevices.mm b/src/multimedia/darwin/qdarwinmediadevices.mm
|
||
|
|
index b0a108935..3ab7e6c05 100644
|
||
|
|
--- a/src/multimedia/darwin/qdarwinmediadevices.mm
|
||
|
|
+++ b/src/multimedia/darwin/qdarwinmediadevices.mm
|
||
|
|
@@ -39,11 +39,8 @@ static AudioDeviceID defaultAudioDevice(QAudioDevice::Mode mode)
|
||
|
|
{
|
||
|
|
const AudioObjectPropertySelector selector = (mode == QAudioDevice::Output) ? kAudioHardwarePropertyDefaultOutputDevice
|
||
|
|
: kAudioHardwarePropertyDefaultInputDevice;
|
||
|
|
- const AudioObjectPropertyAddress propertyAddress = {
|
||
|
|
- selector,
|
||
|
|
- kAudioObjectPropertyScopeGlobal,
|
||
|
|
- kAudioObjectPropertyElementMain,
|
||
|
|
- };
|
||
|
|
+ const AudioObjectPropertyAddress propertyAddress = { selector, kAudioObjectPropertyScopeGlobal,
|
||
|
|
+ kAudioObjectPropertyElementMaster };
|
||
|
|
|
||
|
|
if (auto audioDevice = getAudioObject<AudioDeviceID>(kAudioObjectSystemObject, propertyAddress,
|
||
|
|
"Default Device")) {
|
||
|
|
@@ -77,7 +74,7 @@ static QList<QAudioDevice> availableAudioDevices(QAudioDevice::Mode mode)
|
||
|
|
|
||
|
|
const AudioObjectPropertyAddress audioDevicesPropertyAddress = {
|
||
|
|
kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal,
|
||
|
|
- kAudioObjectPropertyElementMain
|
||
|
|
+ kAudioObjectPropertyElementMaster
|
||
|
|
};
|
||
|
|
|
||
|
|
if (auto audioDevices = getAudioData<AudioDeviceID>(
|
||
|
|
@@ -130,11 +127,11 @@ static OSStatus audioDeviceChangeListener(AudioObjectID id, UInt32,
|
||
|
|
|
||
|
|
static constexpr AudioObjectPropertyAddress listenerAddresses[] = {
|
||
|
|
{ kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal,
|
||
|
|
- kAudioObjectPropertyElementMain },
|
||
|
|
+ kAudioObjectPropertyElementMaster },
|
||
|
|
{ kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal,
|
||
|
|
- kAudioObjectPropertyElementMain },
|
||
|
|
+ kAudioObjectPropertyElementMaster },
|
||
|
|
{ kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal,
|
||
|
|
- kAudioObjectPropertyElementMain }
|
||
|
|
+ kAudioObjectPropertyElementMaster }
|
||
|
|
};
|
||
|
|
|
||
|
|
static void setAudioListeners(QDarwinMediaDevices &instance)
|
||
|
|
diff --git a/src/multimedia/darwin/qmacosaudiodatautils_p.h b/src/multimedia/darwin/qmacosaudiodatautils_p.h
|
||
|
|
index 8cc2f8440..5cd6fced2 100644
|
||
|
|
--- a/src/multimedia/darwin/qmacosaudiodatautils_p.h
|
||
|
|
+++ b/src/multimedia/darwin/qmacosaudiodatautils_p.h
|
||
|
|
@@ -44,7 +44,7 @@ void printUnableToReadWarning(const char *logName, AudioObjectID objectID, const
|
||
|
|
|
||
|
|
inline static AudioObjectPropertyAddress
|
||
|
|
makePropertyAddress(AudioObjectPropertySelector selector, QAudioDevice::Mode mode,
|
||
|
|
- AudioObjectPropertyElement element = kAudioObjectPropertyElementMain)
|
||
|
|
+ AudioObjectPropertyElement element = kAudioObjectPropertyElementMaster)
|
||
|
|
{
|
||
|
|
return { selector,
|
||
|
|
mode == QAudioDevice::Input ? kAudioDevicePropertyScopeInput
|