mirror of https://github.com/FreeRDP/FreeRDP
Merge pull request #5811 from mfleisz/mac_rdpsnd_workaround
rdpsnd: Do not set output device on Catalina or later (#5747)
This commit is contained in:
commit
5d804852b5
|
@ -167,15 +167,23 @@ static BOOL rdpsnd_mac_open(rdpsndDevicePlugin *device, const AUDIO_FORMAT *form
|
|||
if (!mac->engine)
|
||||
return FALSE;
|
||||
|
||||
if (@available(macOS 10.15, *))
|
||||
{
|
||||
/* Setting the output audio device on 10.15 or later breaks sound playback. Do not set for
|
||||
* now until we find a proper fix for #5747 */
|
||||
}
|
||||
else
|
||||
{
|
||||
err = AudioUnitSetProperty(mac->engine.outputNode.audioUnit,
|
||||
kAudioOutputUnitProperty_CurrentDevice, kAudioUnitScope_Global, 0,
|
||||
&outputDeviceID, sizeof(outputDeviceID));
|
||||
kAudioOutputUnitProperty_CurrentDevice, kAudioUnitScope_Global,
|
||||
0, &outputDeviceID, sizeof(outputDeviceID));
|
||||
if (err)
|
||||
{
|
||||
rdpsnd_mac_release(mac);
|
||||
WLog_ERR(TAG, "AudioUnitSetProperty: %s", FormatError(err));
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
mac->player = [[AVAudioPlayerNode alloc] init];
|
||||
if (!mac->player)
|
||||
|
|
Loading…
Reference in New Issue