4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mac-capture: Replace kAudioObjectPropertyElementMaster with Main

Browse source
This commit is contained in:
gxalpha 2023-10-16 13:54:17 +02:00 • committed by Ryan Foster
commit 3d2df1c6d7
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/mac-capture/audio-device-enum.c
View file

@ -44,7 +44,7 @@ static bool coreaudio_enum_device(enum_device_proc_t proc, void *param,
AudioObjectPropertyAddress addr = {kAudioDevicePropertyStreams,
kAudioDevicePropertyScopeInput,
kAudioObjectPropertyElementMaster};
kAudioObjectPropertyElementMain};
/* check to see if it's a mac input device */
AudioObjectGetPropertyDataSize(id, &addr, 0, NULL, &size);
@ -77,7 +77,7 @@ static void enum_devices(enum_device_proc_t proc, void *param)
{
AudioObjectPropertyAddress addr = {kAudioHardwarePropertyDevices,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster};
kAudioObjectPropertyElementMain};
UInt32 size = 0;
UInt32 count;
@ -142,7 +142,7 @@ bool coreaudio_get_device_id(CFStringRef uid, AudioDeviceID *id)
AudioObjectPropertyAddress propertyAddress = {
kAudioHardwarePropertyDeviceForUID,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster};
kAudioObjectPropertyElementMain};
AudioValueTranslation translation = {&uid, sizeof(CFStringRef), id,
sizeof(AudioDeviceID)};

12
plugins/mac-capture/mac-audio.c
View file

@ -82,7 +82,7 @@ static bool find_device_id_by_uid(struct coreaudio_data *ca)
AudioObjectPropertyAddress addr = {
.mScope = kAudioObjectPropertyScopeGlobal,
.mElement = kAudioObjectPropertyElementMaster};
.mElement = kAudioObjectPropertyElementMain};
if (!ca->device_uid)
ca->device_uid = bstrdup("default");
@ -283,7 +283,7 @@ static bool coreaudio_init_buffer(struct coreaudio_data *ca)
AudioObjectPropertyAddress addr = {
kAudioDevicePropertyStreamConfiguration,
kAudioDevicePropertyScopeInput,
kAudioObjectPropertyElementMaster};
kAudioObjectPropertyElementMain};
stat = AudioObjectGetPropertyDataSize(ca->device_id, &addr, 0, NULL,
&buf_size);
@ -431,7 +431,7 @@ static OSStatus add_listener(struct coreaudio_data *ca, UInt32 property)
{
AudioObjectPropertyAddress addr = {property,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster};
kAudioObjectPropertyElementMain};
return AudioObjectAddPropertyListener(ca->device_id, &addr,
notification_callback, ca);
@ -457,7 +457,7 @@ static bool coreaudio_init_hooks(struct coreaudio_data *ca)
AudioObjectPropertyAddress addr = {
PROPERTY_DEFAULT_DEVICE,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster};
kAudioObjectPropertyElementMain};
stat = AudioObjectAddPropertyListener(kAudioObjectSystemObject,
&addr,
@ -484,7 +484,7 @@ static void coreaudio_remove_hooks(struct coreaudio_data *ca)
AudioObjectPropertyAddress addr = {kAudioDevicePropertyDeviceIsAlive,
kAudioObjectPropertyScopeGlobal,
kAudioObjectPropertyElementMaster};
kAudioObjectPropertyElementMain};
AudioObjectRemovePropertyListener(ca->device_id, &addr,
notification_callback, ca);
@ -513,7 +513,7 @@ static bool coreaudio_get_device_name(struct coreaudio_data *ca)
const AudioObjectPropertyAddress addr = {
kAudioDevicePropertyDeviceNameCFString,
kAudioObjectPropertyScopeInput,
kAudioObjectPropertyElementMaster};
kAudioObjectPropertyElementMain};
OSStatus stat = AudioObjectGetPropertyData(ca->device_id, &addr, 0,
NULL, &size, &cf_name);