jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1318 from TheOrsa/fixMonitoringOnOSX

Browse Source 
libobs: Fix Monitoring devices showing input devices
This commit is contained in:
Jim 2018-06-17 23:02:27 -07:00 committed by GitHub
commit 1a31d9097c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libobs/audio-monitoring/osx/coreaudio-enum-devices.c
View File

@ -32,7 +32,7 @@ static bool obs_enum_audio_monitoring_device(obs_enum_audio_device_cb cb,
/* check to see if it's a mac input device */
if (!allow_inputs) {
AudioObjectGetPropertyDataSize(id, &addr, 0, NULL, &size);
if (!size)
if (size)
return true;
}
@ -41,7 +41,7 @@ static bool obs_enum_audio_monitoring_device(obs_enum_audio_device_cb cb,
addr.mSelector = kAudioDevicePropertyDeviceUID;
stat = AudioObjectGetPropertyData(id, &addr, 0, NULL, &size, &cf_uid);
if (!success(stat, "get audio device UID"))
return true;
goto fail;
addr.mSelector = kAudioDevicePropertyDeviceNameCFString;
stat = AudioObjectGetPropertyData(id, &addr, 0, NULL, &size, &cf_name);

2
libobs/audio-monitoring/osx/coreaudio-output.c
View File

@ -1,5 +1,5 @@
#include <AudioUnit/AudioUnit.h>
#include <AudioToolBox/AudioQueue.h>
#include <AudioToolbox/AudioQueue.h>
#include <CoreFoundation/CFString.h>
#include <CoreAudio/CoreAudio.h>