refs #1796 Fix crash after a connection via Microsoft Desktop

.github/workflows/main.yml

@@ -6,12 +6,17 @@ on:
       - dev
       - rafael/*
     paths-ignore:
-      - '**/*.md'
-      - '.github/ISSUE_TEMPLATE/*'
-      - '.github/workflows/sponsors.yml'
-      - '.github/workflows/translators.yml'
-      - 'Graphics/*'
-
+      - "**/*.md"
+      - ".github/ISSUE_TEMPLATE/*"
+      - ".github/workflows/sponsors.yml"
+      - ".github/workflows/translators.yml"
+      - "Graphics/*"
+  pull_request:
+    branches:
+      - dev
+    paths-ignore:
+      - "**/*.md"
+      - crowdin.yml
 env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true

.github/workflows/sponsors.yml

@@ -11,7 +11,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Generate Sponsors
-        uses: JamesIves/github-sponsors-readme-action@v1.2.2
+        uses: JamesIves/github-sponsors-readme-action@v1
         with:
           token: ${{ secrets.SPONSORS_PAT }}
           file: 'README.md'

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## x.x.x.x
+- Fix crash after a connection through Microsoft Remote Desktop
 - Added support for StartAllBack multitaskbar notification area (thanks @Simplestas!)
 - Fixed various process lifecycle trigger bugs (thanks @spacechase0!)
 - Fixed an issue with EarTrumpet tooltips not updating in some scenarios (thanks @Tester798!)

EarTrumpet/App.xaml.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
@@ -125,11 +126,15 @@ private void ContinueStartup()
         Exit += (_, __) => SystemEvents.SessionSwitch -= SystemEvents_SessionSwitch;
     }
 
-    private void SystemEvents_SessionSwitch(object sender, SessionSwitchEventArgs e)
+    private async void SystemEvents_SessionSwitch(object sender, SessionSwitchEventArgs e)
     {
         Trace.WriteLine($"Detected User Session Switch: {e.Reason}");
         if (e.Reason == SessionSwitchReason.ConsoleConnect)
         {
+            // Give the audio subsystem time to settle after the session switch.
+            // Devices may not be fully available immediately after returning from RDP.
+            await Task.Delay(2000);
+
             var devManager = WindowsAudioFactory.Create(AudioDeviceKind.Playback);
             devManager.RefreshAllDevices();
         }

EarTrumpet/DataModel/Audio/Mocks/AudioDevice.cs

@@ -74,5 +74,10 @@ public void MoveHiddenAppsToDevice(string appId, string id)
     public void UnhideSessionsForProcessId(uint processId)
     {
     }
+
+    public float GetVolumeScalar() => _volume;
+    public float GetVolumeLogarithmic() => _volume;
+    public void SetVolumeScalar(float value) => Volume = value;
+    public void SetVolumeLogarithmic(float value) => Volume = value;
 }
 #endif

EarTrumpet/DataModel/Audio/Mocks/AudioDeviceSession.cs

@@ -105,5 +105,10 @@ public void UpdatePeakValueBackground()
     {
 
     }
+
+    public float GetVolumeScalar() => _volume;
+    public float GetVolumeLogarithmic() => _volume;
+    public void SetVolumeScalar(float value) => Volume = value;
+    public void SetVolumeLogarithmic(float value) => Volume = value;
 }
 #endif

EarTrumpet/DataModel/WindowsAudio/Internal/AudioDevice.cs

@@ -109,20 +109,27 @@ public AudioDevice(IAudioDeviceManager deviceManager, IMMDevice device, Dispatch
 
     public unsafe void OnNotify(AUDIO_VOLUME_NOTIFICATION_DATA* pNotify)
     {
-        _volume = (*pNotify).fMasterVolume;
-        if (App.Settings.UseLogarithmicVolume)
+        try
         {
-            _deviceVolume.GetMasterVolumeLevel(out _volume);
-        }
-        _isMuted = (*pNotify).bMuted != 0;
+            _volume = (*pNotify).fMasterVolume;
+            if (App.Settings.UseLogarithmicVolume)
+            {
+                _deviceVolume.GetMasterVolumeLevel(out _volume);
+            }
+            _isMuted = (*pNotify).bMuted != 0;
 
-        _channels.OnNotify((nint)pNotify, *pNotify);
+            _channels.OnNotify((nint)pNotify, *pNotify);
 
-        _dispatcher.Invoke((Action)(() =>
+            _dispatcher.Invoke((Action)(() =>
+            {
+                RaisePropertyChanged(nameof(Volume));
+                RaisePropertyChanged(nameof(IsMuted));
+            }));
+        }
+        catch (Exception ex)
         {
-            RaisePropertyChanged(nameof(Volume));
-            RaisePropertyChanged(nameof(IsMuted));
-        }));
+            Trace.WriteLine($"AudioDevice OnNotify: {ex}");
+        }
     }
 
     /// <summary>

EarTrumpet/DataModel/WindowsAudio/Internal/AudioDeviceManager.cs

@@ -338,12 +338,23 @@ private void TraceLine(string message)
 
     public void RefreshAllDevices()
     {
+        TraceLine("RefreshAllDevices");
+
         foreach (var dev in Devices.ToArray())
         {
             ((IMMNotificationClient)this).OnDeviceRemoved(dev.Id);
         }
         _default = null;
 
+        try
+        {
+            _enumerator.UnregisterEndpointNotificationCallback(this);
+        }
+        catch (Exception ex)
+        {
+            TraceLine($"UnregisterEndpointNotificationCallback during refresh: {ex}");
+        }
+
         _enumerator = (IMMDeviceEnumerator)new MMDeviceEnumerator();
         _enumerator.RegisterEndpointNotificationCallback(this);
 
@@ -355,13 +366,12 @@ public void RefreshAllDevices()
             device.GetId(out var deviceId);
             ((IMMNotificationClient)this).OnDeviceAdded(deviceId);
         }
-        this.OnDefaultDeviceChanged(EDataFlow.eRender, ERole.eMultimedia, null);
-        this.OnDefaultDeviceChanged(EDataFlow.eRender, ERole.eConsole, null);
+        ((IMMNotificationClient)this).OnDefaultDeviceChanged(Flow, ERole.eMultimedia, default);
+        ((IMMNotificationClient)this).OnDefaultDeviceChanged(Flow, ERole.eConsole, default);
 
         _dispatcher.Invoke((Action)(() =>
         {
             QueryDefaultDevice();
         }));
-
     }
 }

EarTrumpet/DataModel/WindowsAudio/Internal/AudioDeviceSession.cs

@@ -426,80 +426,146 @@ private void DisconnectSession()
         _isDisconnected = true;
         _dispatcher.BeginInvoke((Action)(() =>
         {
-            RaisePropertyChanged(nameof(State));
+            try
+            {
+                RaisePropertyChanged(nameof(State));
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine($"AudioDeviceSession DisconnectSession dispatch: {ex}");
+            }
         }));
     }
 
     unsafe void IAudioSessionEvents.OnSimpleVolumeChanged(float NewVolume, BOOL NewMute, Guid* EventContext)
     {
-        _volume = NewVolume;
-        _isMuted = NewMute != 0;
+        try
+        {
+            _volume = NewVolume;
+            _isMuted = NewMute != 0;
 
-        _dispatcher.BeginInvoke((Action)(() =>
+            _dispatcher.BeginInvoke((Action)(() =>
+            {
+                RaisePropertyChanged(nameof(Volume));
+                RaisePropertyChanged(nameof(IsMuted));
+            }));
+        }
+        catch (Exception ex)
         {
-            RaisePropertyChanged(nameof(Volume));
-            RaisePropertyChanged(nameof(IsMuted));
-        }));
+            Trace.WriteLine($"AudioDeviceSession OnSimpleVolumeChanged: {ex}");
+        }
     }
 
     unsafe void IAudioSessionEvents.OnGroupingParamChanged(Guid* NewGroupingParam, Guid* EventContext)
     {
-        GroupingParam = *NewGroupingParam;
-        Trace.WriteLine($"AudioDeviceSession OnGroupingParamChanged {ExeName} {Id}");
-        _dispatcher.BeginInvoke((Action)(() =>
+        try
         {
-            RaisePropertyChanged(nameof(GroupingParam));
-        }));
+            GroupingParam = *NewGroupingParam;
+            Trace.WriteLine($"AudioDeviceSession OnGroupingParamChanged {ExeName} {Id}");
+            _dispatcher.BeginInvoke((Action)(() =>
+            {
+                RaisePropertyChanged(nameof(GroupingParam));
+            }));
+        }
+        catch (Exception ex)
+        {
+            Trace.WriteLine($"AudioDeviceSession OnGroupingParamChanged: {ex}");
+        }
     }
 
     void IAudioSessionEvents.OnStateChanged(AudioSessionState NewState)
     {
-        Trace.WriteLine($"AudioDeviceSession OnStateChanged {NewState} {ExeName} {Id}");
+        try
+        {
+            Trace.WriteLine($"AudioDeviceSession OnStateChanged {NewState} {ExeName} {Id}");
 
-        _state = NewState;
+            _state = NewState;
 
-        if (_isMoved && NewState == AudioSessionState.AudioSessionStateActive)
-        {
-            _isMoved = false;
+            if (_isMoved && NewState == AudioSessionState.AudioSessionStateActive)
+            {
+                _isMoved = false;
+            }
+            else if (_moveOnInactive && NewState == AudioSessionState.AudioSessionStateInactive)
+            {
+                _isMoved = true;
+                _moveOnInactive = false;
+            }
+
+            _dispatcher.BeginInvoke((Action)(() =>
+            {
+                try
+                {
+                    RaisePropertyChanged(nameof(State));
+                }
+                catch (Exception ex)
+                {
+                    Trace.WriteLine($"AudioDeviceSession OnStateChanged dispatch: {ex}");
+                }
+            }));
         }
-        else if (_moveOnInactive && NewState == AudioSessionState.AudioSessionStateInactive)
+        catch (Exception ex)
         {
-            _isMoved = true;
-            _moveOnInactive = false;
+            Trace.WriteLine($"AudioDeviceSession OnStateChanged: {ex}");
         }
-
-        _dispatcher.BeginInvoke((Action)(() =>
-        {
-            RaisePropertyChanged(nameof(State));
-        }));
     }
 
     unsafe void IAudioSessionEvents.OnDisplayNameChanged(PCWSTR NewDisplayName, Guid* EventContext)
     {
-        ChooseDisplayName(NewDisplayName.ToString());
+        try
+        {
+            ChooseDisplayName(NewDisplayName.ToString());
 
-        _dispatcher.BeginInvoke((Action)(() =>
+            _dispatcher.BeginInvoke((Action)(() =>
+            {
+                RaisePropertyChanged(nameof(DisplayName));
+            }));
+        }
+        catch (Exception ex)
         {
-            RaisePropertyChanged(nameof(DisplayName));
-        }));
+            Trace.WriteLine($"AudioDeviceSession OnDisplayNameChanged: {ex}");
+        }
     }
 
-    void IAudioSessionEvents.OnSessionDisconnected(AudioSessionDisconnectReason DisconnectReason) => DisconnectSession();
+    void IAudioSessionEvents.OnSessionDisconnected(AudioSessionDisconnectReason DisconnectReason)
+    {
+        try
+        {
+            DisconnectSession();
+        }
+        catch (Exception ex)
+        {
+            Trace.WriteLine($"AudioDeviceSession OnSessionDisconnected: {ex}");
+        }
+    }
 
     unsafe void IAudioSessionEvents.OnChannelVolumeChanged(uint ChannelCount, float[] afNewChannelVolume, uint ChangedChannel, Guid* EventContext)
     {
-        var channelVolumesValues = new float[ChannelCount];
-        Array.Copy(afNewChannelVolume, 0, channelVolumesValues, 0, (int)ChannelCount);
+        try
+        {
+            var channelVolumesValues = new float[ChannelCount];
+            Array.Copy(afNewChannelVolume, 0, channelVolumesValues, 0, (int)ChannelCount);
 
-        for (var i = 0; i < ChannelCount; i++)
+            for (var i = 0; i < ChannelCount; i++)
+            {
+                _channels.Channels[i].SetLevel(channelVolumesValues[i]);
+            }
+        }
+        catch (Exception ex)
         {
-            _channels.Channels[i].SetLevel(channelVolumesValues[i]);
+            Trace.WriteLine($"AudioDeviceSession OnChannelVolumeChanged: {ex}");
         }
     }
 
     unsafe void IAudioSessionEvents.OnIconPathChanged(PCWSTR NewIconPath, Guid* EventContext)
     {
-        IconPath = NewIconPath.ToString();
-        RaisePropertyChanged(nameof(IconPath));
+        try
+        {
+            IconPath = NewIconPath.ToString();
+            RaisePropertyChanged(nameof(IconPath));
+        }
+        catch (Exception ex)
+        {
+            Trace.WriteLine($"AudioDeviceSession OnIconPathChanged: {ex}");
+        }
     }
 }

EarTrumpet/DataModel/WindowsAudio/Internal/AudioDeviceSessionCollection.cs

@@ -74,14 +74,21 @@ private void CreateAndAddSession(IAudioSessionControl session)
             var newSession = new AudioDeviceSession(parent, session, _dispatcher);
             _dispatcher.BeginInvoke((Action)(() =>
             {
-                if (newSession.State == SessionState.Moved)
+                try
                 {
-                    _movedSessions.Add(newSession);
-                    newSession.PropertyChanged += MovedSession_PropertyChanged;
+                    if (newSession.State == SessionState.Moved)
+                    {
+                        _movedSessions.Add(newSession);
+                        newSession.PropertyChanged += MovedSession_PropertyChanged;
+                    }
+                    else if (newSession.State != SessionState.Expired)
+                    {
+                        AddSession(newSession);
+                    }
                 }
-                else if (newSession.State != SessionState.Expired)
+                catch (Exception ex)
                 {
-                    AddSession(newSession);
+                    Trace.WriteLine($"AudioDeviceSessionCollection CreateAndAddSession dispatch: {ex}");
                 }
             }));
         }

LICENSE

@@ -5,6 +5,7 @@ software or associated documentation files:
 
     Yellow Elephant Productions
     Tidal Media Inc.
+    Articent Group LLC
 
 The Excluded Entities may not exercise any of the rights granted to other users
 under these licensing terms.