summaryrefslogtreecommitdiff
path: root/RtAudio.cpp
diff options
context:
space:
mode:
authorGary Scavone <gary.scavone@mcgill.ca>2022-03-16 16:32:39 -0400
committerGary Scavone <gary.scavone@mcgill.ca>2022-03-16 16:32:39 -0400
commite9b1d0262a5e75e09c510eb9c5825daf86884d29 (patch)
tree98ec8bb62e560b32cfae41ce47fe44219c4b0f0b /RtAudio.cpp
parent23d4acc7365ae4a0a6f78c59f41b6d08276783b3 (diff)
Updated CoreAudio kAudioObjectPropertyElementMaster to Main.
Diffstat (limited to 'RtAudio.cpp')
-rw-r--r--RtAudio.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/RtAudio.cpp b/RtAudio.cpp
index 45cee9e..33f7938 100644
--- a/RtAudio.cpp
+++ b/RtAudio.cpp
@@ -587,7 +587,7 @@ RtApiCore:: RtApiCore()
CFRunLoopRef theRunLoop = NULL;
AudioObjectPropertyAddress property = { kAudioHardwarePropertyRunLoop,
kAudioObjectPropertyScopeGlobal,
- kAudioObjectPropertyElementMaster };
+ kAudioObjectPropertyElementMain };
OSStatus result = AudioObjectSetPropertyData( kAudioObjectSystemObject, &property, 0, NULL, sizeof(CFRunLoopRef), &theRunLoop);
if ( result != noErr ) {
errorText_ = "RtApiCore::RtApiCore: error setting run loop property!";
@@ -608,7 +608,7 @@ unsigned int RtApiCore :: getDeviceCount( void )
{
// Find out how many audio devices there are, if any.
UInt32 dataSize;
- AudioObjectPropertyAddress propertyAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+ AudioObjectPropertyAddress propertyAddress = { kAudioHardwarePropertyDevices, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
OSStatus result = AudioObjectGetPropertyDataSize( kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize );
if ( result != noErr ) {
errorText_ = "RtApiCore::getDeviceCount: OS-X error getting device info!";
@@ -626,7 +626,7 @@ unsigned int RtApiCore :: getDefaultInputDevice( void )
AudioDeviceID id;
UInt32 dataSize = sizeof( AudioDeviceID );
- AudioObjectPropertyAddress property = { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+ AudioObjectPropertyAddress property = { kAudioHardwarePropertyDefaultInputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
OSStatus result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property, 0, NULL, &dataSize, &id );
if ( result != noErr ) {
errorText_ = "RtApiCore::getDefaultInputDevice: OS-X system error getting device.";
@@ -659,7 +659,7 @@ unsigned int RtApiCore :: getDefaultOutputDevice( void )
AudioDeviceID id;
UInt32 dataSize = sizeof( AudioDeviceID );
- AudioObjectPropertyAddress property = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMaster };
+ AudioObjectPropertyAddress property = { kAudioHardwarePropertyDefaultOutputDevice, kAudioObjectPropertyScopeGlobal, kAudioObjectPropertyElementMain };
OSStatus result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property, 0, NULL, &dataSize, &id );
if ( result != noErr ) {
errorText_ = "RtApiCore::getDefaultOutputDevice: OS-X system error getting device.";
@@ -708,7 +708,7 @@ RtAudio::DeviceInfo RtApiCore :: getDeviceInfo( unsigned int device )
UInt32 dataSize = sizeof( AudioDeviceID ) * nDevices;
AudioObjectPropertyAddress property = { kAudioHardwarePropertyDevices,
kAudioObjectPropertyScopeGlobal,
- kAudioObjectPropertyElementMaster };
+ kAudioObjectPropertyElementMain };
OSStatus result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property,
0, NULL, &dataSize, (void *) &deviceList );
if ( result != noErr ) {
@@ -1009,7 +1009,7 @@ bool RtApiCore :: probeDeviceOpen( unsigned int device, StreamMode mode, unsigne
UInt32 dataSize = sizeof( AudioDeviceID ) * nDevices;
AudioObjectPropertyAddress property = { kAudioHardwarePropertyDevices,
kAudioObjectPropertyScopeGlobal,
- kAudioObjectPropertyElementMaster };
+ kAudioObjectPropertyElementMain };
OSStatus result = AudioObjectGetPropertyData( kAudioObjectSystemObject, &property,
0, NULL, &dataSize, (void *) &deviceList );
if ( result != noErr ) {
@@ -1503,7 +1503,7 @@ void RtApiCore :: closeStream( void )
if ( handle ) {
AudioObjectPropertyAddress property = { kAudioHardwarePropertyDevices,
kAudioObjectPropertyScopeGlobal,
- kAudioObjectPropertyElementMaster };
+ kAudioObjectPropertyElementMain };
if ( handle->xrunListenerAdded[0] ) {
property.mSelector = kAudioDeviceProcessorOverload;
@@ -1538,7 +1538,7 @@ void RtApiCore :: closeStream( void )
if ( handle ) {
AudioObjectPropertyAddress property = { kAudioHardwarePropertyDevices,
kAudioObjectPropertyScopeGlobal,
- kAudioObjectPropertyElementMaster };
+ kAudioObjectPropertyElementMain };
if ( handle->xrunListenerAdded[1] ) {
property.mSelector = kAudioDeviceProcessorOverload;