Skip to content

Update Engine.Audio.cs - Fix audio halt and deadlock on audio device switch #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OceanCyanTech wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Engine.Audio.cs - Fix audio halt and deadlock on audio device switch #693

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 32 additions & 17 deletions FlyleafLib/Engine/Engine.Audio.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ private void RefreshDevices()
{
List<AudioEndpoint> curs = [];
List<AudioEndpoint> removed = [];
//Declare TargetDeviceId so we can access while device changes and set it accordingly
string targetDeviceId = null;

lock (lockDevices)
{
Expand Down Expand Up @@ -164,25 +166,38 @@ private void RefreshDevices()
Devices.Remove(device);
}

var defaultDevice = deviceEnum.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
if (defaultDevice != null && CurrentDevice.Id != defaultDevice.Id)
{
CurrentDevice.Id = defaultDevice.Id;
CurrentDevice.Name = defaultDevice.FriendlyName;
PropertyChanged?.Invoke(this, new(nameof(CurrentDevice)));
}
var defaultDevice = deviceEnum.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);

if (defaultDevice != null)
{
targetDeviceId = defaultDevice.Id;
}
// OceanCyan: Switched to a proactive default device sync in Task.Run below.
//Only switch if Id has actually changed. This makes sure even if device is connected and removed repetitively, infinite loops do not occur.
if (targetDeviceId != null && targetDeviceId != CurrentDevice.Id)
{
Task.Run(() =>
{
//give time to refresh and then set
Thread.Sleep(300);
SetDevice(targetDeviceId);
});
}

// Fall back to DefaultDevice *Non-UI thread otherwise will freeze (not sure where and why) during xaudio.Dispose()
if (removed.Count > 0)
Task.Run(() =>
{
foreach(var device in removed)
{
foreach(var player in Engine.Players)
if (player.Audio.Device == device)
player.Audio.Device = DefaultDevice;
}
});

// This old logic only triggered on 'removed', whereas the new logic now handles both additons and removals of audio devices to the hardware by syncing to the current Windows default.

//if (removed.Count > 0)
// Task.Run(() =>
// {
// foreach(var device in removed)
// {
// foreach(var player in Engine.Players)
// if (player.Audio.Device == device)
// player.Audio.Device = DefaultDevice;
// }
// });
}
});
}
Expand Down