oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Honor 'device "system"' setting for OSX output

This commit is contained in:
Christian Kröner 2018-03-06 23:08:46 +01:00
parent a3d1b107f4
commit d3f097c7f1
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/output/plugins/OSXOutputPlugin.cxx
View File

@ -138,15 +138,25 @@ AudioOutput *
OSXOutput::Create(EventLoop &, const ConfigBlock &block) OSXOutput::Create(EventLoop &, const ConfigBlock &block)
{ {
OSXOutput *oo = new OSXOutput(block); OSXOutput *oo = new OSXOutput(block);
AudioObjectPropertyAddress aopa;
AudioObjectPropertyAddress aopa = {
kAudioHardwarePropertyDefaultOutputDevice,
kAudioObjectPropertyScopeOutput,
kAudioObjectPropertyElementMaster
};
AudioDeviceID dev_id = kAudioDeviceUnknown; AudioDeviceID dev_id = kAudioDeviceUnknown;
UInt32 dev_id_size = sizeof(dev_id); UInt32 dev_id_size = sizeof(dev_id);
if (oo->component_subtype == kAudioUnitSubType_SystemOutput)
// get system output dev_id if configured
aopa = {
kAudioHardwarePropertyDefaultSystemOutputDevice,
kAudioObjectPropertyScopeOutput,
kAudioObjectPropertyElementMaster
};
else
// fallback to default device initially (can still be changed by osx_output_set_device)
aopa = {
kAudioHardwarePropertyDefaultOutputDevice,
kAudioObjectPropertyScopeOutput,
kAudioObjectPropertyElementMaster
};
AudioObjectGetPropertyData(kAudioObjectSystemObject, AudioObjectGetPropertyData(kAudioObjectSystemObject,
&aopa, &aopa,
0, 0,