fix(TrayIcon::Menu): Fix issue with the menu not showing up when it should.

Fixes #635

Author: Belphemur

SoundSwitch/Framework/Audio/Lister/CachedAudioDeviceLister.cs

@@ -27,36 +27,14 @@ namespace SoundSwitch.Framework.Audio.Lister
     public class CachedAudioDeviceLister : IAudioDeviceLister
     {
         /// <inheritdoc />
-        public IReadOnlyCollection<DeviceFullInfo> PlaybackDevices
-        {
-            get
-            {
-                lock (_lockPlayback)
-                {
-                    return _playbackList;
-                }
-            }
-        }
+        public IReadOnlyCollection<DeviceFullInfo> PlaybackDevices { get; private set; } = new DeviceFullInfo[0];
 
         /// <inheritdoc />
-        public IReadOnlyCollection<DeviceFullInfo> RecordingDevices
-        {
-            get
-            {
-                lock (_lockRecording)
-                {
-                    return _recordingList;
-                }
-            }
-        }
+        public IReadOnlyCollection<DeviceFullInfo> RecordingDevices { get; private set; } = new DeviceFullInfo[0];
 
         private readonly DeviceState _state;
         private readonly DebounceDispatcher _dispatcher = new();
         private readonly object _lockRefresh = new();
-        private readonly object _lockRecording = new();
-        private readonly object _lockPlayback = new();
-        private IReadOnlyCollection<DeviceFullInfo> _playbackList = new DeviceFullInfo[0];
-        private IReadOnlyCollection<DeviceFullInfo> _recordingList = new DeviceFullInfo[0];
 
 
         public CachedAudioDeviceLister(DeviceState state)
@@ -108,15 +86,9 @@ public void Refresh()
                     }
                 }
 
-                lock (_lockPlayback)
-                {
-                    _playbackList = playbackDevices.Values.ToArray();
-                }
+                PlaybackDevices = playbackDevices.Values.ToArray();
+                RecordingDevices = recordingDevices.Values.ToArray();
 
-                lock (_lockRecording)
-                {
-                    _recordingList = recordingDevices.Values.ToArray();
-                }
 
                 Log.Information("[{@State}] Refreshed all devices. {@Recording}/rec, {@Playback}/play", _state, recordingDevices.Count, playbackDevices.Count);
             }

SoundSwitch/Framework/Logger/Configuration/LoggerConfigurator.cs

@@ -20,7 +20,7 @@ public static void ConfigureLogger()
                          .Enrich.WithExceptionDetails()
                          .Enrich.WithCaller()
 #if DEBUG
-                         .WriteTo.Console(theme: Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme.Code)
+                         .WriteTo.Console(LogEventLevel.Verbose, "[{Timestamp:HH:mm:ss.fff} {Level:u3}] {Message} (at {Caller}){NewLine}{Exception}", theme: Serilog.Sinks.SystemConsole.Themes.AnsiConsoleTheme.Code)
 #endif
                          .WriteTo.File(Path.Combine(ApplicationPath.Logs, "soundswitch.log"),
                              rollingInterval: RollingInterval.Day, retainedFileCountLimit: 3,

SoundSwitch/UI/Component/TrayIcon.cs

@@ -23,6 +23,8 @@
 using System.Windows.Forms;
 using NAudio.CoreAudioApi;
 using Serilog;
+using SoundSwitch.Audio.Manager;
+using SoundSwitch.Audio.Manager.Interop.Enum;
 using SoundSwitch.Common.Framework.Audio.Device;
 using SoundSwitch.Framework;
 using SoundSwitch.Framework.Configuration;
@@ -72,10 +74,12 @@ public sealed class TrayIcon : IDisposable
         private readonly ToolStripMenuItem _updateMenuItem;
         private TimerForm _animationTimer;
         private readonly UpdateDownloadForm _updateDownloadForm;
+        private readonly MethodInfo? _showContextMenu;
 
         public TrayIcon()
         {
             UpdateIcon();
+            _showContextMenu = typeof(NotifyIcon).GetMethod("ShowContextMenu", BindingFlags.Instance | BindingFlags.NonPublic);
             _tooltipInfoManager = new TooltipInfoManager(NotifyIcon);
             _profileTrayIconBuilder = new ProfileTrayIconBuilder();
 
@@ -89,10 +93,18 @@ public TrayIcon()
 
             _selectionMenu.Items.Add(TrayIconStrings.noDevicesSelected, RessourceSettingsSmallBitmap, (sender, e) => ShowSettings());
 
-            NotifyIcon.MouseDoubleClick += (sender, args) => { AppModel.Instance.CycleActiveDevice(DataFlow.Render); };
+            //NotifyIcon.MouseDoubleClick += (sender, args) => { AppModel.Instance.CycleActiveDevice(DataFlow.Render); };
 
-            NotifyIcon.MouseClick += (sender, e) =>
+            NotifyIcon.MouseDown += (sender, e) =>
             {
+                Log.Debug("Click on systray icon: {times} {button}", e.Clicks, e.Button);
+                if (e.Clicks == 2)
+                {
+                    NotifyIcon.ContextMenuStrip.Close();
+                    AppModel.Instance.CycleActiveDevice(DataFlow.Render);
+                    return;
+                }
+
                 if (e.Button != MouseButtons.Left) return;
 
                 if (_updateMenuItem.Tag != null)
@@ -103,9 +115,7 @@ public TrayIcon()
 
                 UpdateDeviceSelectionList();
                 NotifyIcon.ContextMenuStrip = _selectionMenu;
-                var mi = typeof(NotifyIcon).GetMethod("ShowContextMenu",
-                    BindingFlags.Instance | BindingFlags.NonPublic);
-                mi.Invoke(NotifyIcon, null);
+                _showContextMenu.Invoke(NotifyIcon, null);
 
                 NotifyIcon.ContextMenuStrip = _settingsMenu;
             };
@@ -295,6 +305,7 @@ public void ShowSettings()
         /// </summary>
         public void UpdateDeviceSelectionList()
         {
+            Log.Information("Set tray icon menu devices");
             _selectionMenu.Items.Clear();
             var playbackDevices = AppModel.Instance.AvailablePlaybackDevices;
             var recordingDevices = AppModel.Instance.AvailableRecordingDevices;
@@ -313,13 +324,15 @@ public void UpdateDeviceSelectionList()
                 return;
             }
 
-            Log.Information("Set tray icon menu devices");
-            _selectionMenu.Items.AddRange(playbackDevices.Select(info => new ToolStripDeviceItem(DeviceClicked, info)).ToArray());
+            var defaultPlayback = AudioSwitcher.Instance.GetDefaultAudioEndpoint(EDataFlow.eRender, ERole.eConsole);
+            _selectionMenu.Items.AddRange(playbackDevices.Select(info => new ToolStripDeviceItem(DeviceClicked, info, info.Equals(defaultPlayback))).ToArray());
 
             if (recordingDevices.Count > 0)
             {
+                var defaultRecording = AudioSwitcher.Instance.GetDefaultAudioEndpoint(EDataFlow.eCapture, ERole.eConsole);
+
                 _selectionMenu.Items.Add(new ToolStripSeparator());
-                _selectionMenu.Items.AddRange(recordingDevices.Select(info => new ToolStripDeviceItem(DeviceClicked, info)).ToArray());
+                _selectionMenu.Items.AddRange(recordingDevices.Select(info => new ToolStripDeviceItem(DeviceClicked, info, info.Equals(defaultRecording))).ToArray());
             }
         }
 

SoundSwitch/Util/ToolStripDeviceItem.cs

@@ -16,8 +16,6 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using SoundSwitch.Audio.Manager;
-using SoundSwitch.Audio.Manager.Interop.Enum;
 using SoundSwitch.Common.Framework.Audio.Device;
 using SoundSwitch.Properties;
 
@@ -27,11 +25,11 @@ internal class ToolStripDeviceItem : ToolStripMenuItem
     {
         private readonly bool _isDefault;
 
-        public ToolStripDeviceItem(EventHandler onClick, DeviceFullInfo audioDevice)
+        public ToolStripDeviceItem(EventHandler onClick, DeviceFullInfo audioDevice, bool isDefault)
             : base(audioDevice.NameClean, null, onClick)
         {
             AudioDevice = audioDevice;
-            _isDefault = AudioSwitcher.Instance.IsDefault(AudioDevice.Id, (EDataFlow) AudioDevice.Type, ERole.eConsole);
+            _isDefault = isDefault;
         }
 
         public override Image Image => _isDefault ? Resources.Check : null;