adding readme and previews

update action icon with padding

README.md

@@ -1,2 +1,39 @@
-# FocusVolumeControlPlugin
+# Focus Volume Control Plugin
 
+A plugin for the Stream Deck+ to control the volume of the focused application.
+
+## Description
+
+This Stream Deck plugin utilizes the Stream Deck+ encoders and screen to allow you to control the volume of the focused application.
+Application volume is changed with the windows volume mixer.
+
+Unlike faders or potentiometers, the encoders of the Stream Deck+ spin infinitely in either direction. Which means when you change your focused application, you don't have to worry about desynchronization with the current app.
+The screen updates to show the name/icon of the app so that you can always know what you're about to change.
+
+![Focus volume control plugin preview](previews/preview.png?raw=true)
+
+## Developing
+
+build the solution with visual studio
+run `install.bat <debug | release>`
+
+to debug, attach to the FocusVolumeControl running process
+
+
+There is also a secondary sound browser project which can be used for viewing information about processes and how the algorithm matches them to volume mixers
+
+
+## License
+
+This project is licensed under the MIT License - see the LICENSE file for detiails
+
+## Acknowledgements
+
+Inspiration, code snippets, etc.
+* [BinRaider's streamdeck-tools](https://github.com/BarRaider/streamdeck-tools)
+* [Deej](https://github.com/omriharel/deej)
+* [Stream Deck Developer Guide](https://docs.elgato.com/sdk/plugins/getting-started)
+* [CoreAudio](https://github.com/morphx666/CoreAudio)
+
+Inspiration
+* [PCPanel](https://www.getpcpanel.com/)

src/FocusVolumeControl/ActiveAudioSessionWrapper.cs

@@ -1,73 +0,0 @@
-using CoreAudio;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FocusVolumeControl
-{
-	public class ActiveAudioSessionWrapper
-	{
-		public string DisplayName { get; set; }
-		public string ExecutablePath { get; set; }
-		private List<SimpleAudioVolume> Volume { get; } = new List<SimpleAudioVolume>();
-
-		public string Icon { get; set; }
-
-		public bool Any()
-		{
-			return Volume.Any();
-		}
-		public int Count => Volume.Count;
-
-		public void AddVolume(SimpleAudioVolume volume)
-		{
-			Volume.Add(volume);
-		}
-
-		public void ToggleMute()
-		{
-			//when all volumes are muted, Volume.All will return true
-			//so we swap from muted to false (opposite of Volume.All)
-
-			//when any volumes are unmuted, Volume.All will return false
-			//so we set muted to true (opposite of Volume.All)
-
-			var muted = Volume.All(x => x.Mute);
-
-			Volume.ForEach(x => x.Mute = !muted);
-		}
-
-		public bool? GetMuted()
-		{
-			var muted = Volume.All(x => x.Mute);
-			var unmuted = Volume.All(x => !x.Mute);
-
-			if(muted == !unmuted)
-			{
-				return muted;
-			}
-			return null;
-		}
-
-		public void IncrementVolumeLevel(int step, int ticks)
-		{
-			//if you have more than one volume. they will all get set based on the first volume control
-			var level = Volume.FirstOrDefault()?.MasterVolume ?? 0;
-
-			level += (0.01f * step) * ticks;
-			level = Math.Max(level, 0);
-
-			Volume.ForEach(x => x.MasterVolume = level);
-		}
-
-		public int GetVolumeLevel()
-		{
-			var level = Volume.FirstOrDefault()?.MasterVolume ?? 0;
-			return (int)(level * 100);
-		}
-
-
-	}
-}

src/FocusVolumeControl/AudioHelper.cs

@@ -1,121 +1,180 @@
 using CoreAudio;
+using FocusVolumeControl.AudioSessions;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace FocusVolumeControl
+namespace FocusVolumeControl;
+
+public class AudioHelper
 {
-	public class AudioHelper
+	IAudioSession _current;
-	{
+	List<Process> _currentProcesses;
-		ActiveAudioSessionWrapper _current;
-		List<Process> _currentProcesses;
 
-		public ActiveAudioSessionWrapper FindSession(List<Process> processes)
+	public IAudioSession FindSession(List<Process> processes)
+	{
+		var deviceEnumerator = new MMDeviceEnumerator(Guid.NewGuid());
+
+		using var device = deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
+		using var manager = device.AudioSessionManager2;
+
+		var sessions = manager.Sessions;
+
+		var matchingSession = new ActiveAudioSessionWrapper();
+
+		foreach (var session in sessions)
+		{
+			var audioProcess = Process.GetProcessById((int)session.ProcessID);
+
+			if (processes.Any(x => x.Id == session.ProcessID || x.ProcessName == audioProcess?.ProcessName))
+			{
+				try
+				{
+					var displayName = audioProcess.MainModule.FileVersionInfo.FileDescription;
+					if (string.IsNullOrEmpty(displayName))
+					{
+						displayName = audioProcess.ProcessName;
+					}
+					matchingSession.DisplayName = displayName;
+				}
+				catch
+				{
+					matchingSession.DisplayName ??= audioProcess.ProcessName;
+				}
+
+				matchingSession.ExecutablePath ??= audioProcess.MainModule.FileName;
+
+				//some apps like discord have multiple volume processes.
+				matchingSession.AddVolume(session.SimpleAudioVolume);
+			}
+		}
+		return matchingSession.Any() ? matchingSession : null;
+	}
+
+	static object _lock = new object();
+
+	public IAudioSession GetActiveSession(FallbackBehavior fallbackBehavior)
+	{
+		lock (_lock)
+		{
+			var processes = GetPossibleProcesses();
+
+			if (_currentProcesses == null || !_currentProcesses.SequenceEqual(processes))
+			{
+				_current = FindSession(processes);
+			}
+
+			if(_current == null)
+			{
+				if(fallbackBehavior == FallbackBehavior.SystemSounds)
+				{
+					_current = GetSystemSounds();
+				}
+				else if(fallbackBehavior == FallbackBehavior.SystemVolume)
+				{
+					_current = GetSystemVolume();
+				}
+			}
+
+			_currentProcesses = processes;
+			return _current;
+		}
+	}
+
+	/// <summary>
+	/// Get the list of processes that might be currently selected
+	/// This includes getting the child window's processes
+	///
+	/// This helps to find the audo process for windows store apps whose process is "ApplicationFrameHost.exe"
+	///
+	/// The list may optionally include a parent process, because that helps thing steam to be more reliable because the steamwebhelper (ui) is a child of steam.exe
+	///
+	/// According to deej, getting the ForegroundWindow and enumerating steam windows should work, but it doesn't seem to work for me without including the parent process
+	/// https://github.com/omriharel/deej/blob/master/pkg/deej/util/util_windows.go#L22
+	/// 
+	/// but the parent process is sometimes useless (explorer, svchost, etc) so i filter some of them out because i felt like it when i wrote the code
+	///
+	/// I also experimented with grabbing the parent process and enumerating through the windows to see if that would help, but any time the parent process was an unexpected process (explorer) it could blow up. so i decided not to bother for now
+	/// </summary>
+	/// <returns></returns>
+	public List<Process> GetPossibleProcesses()
+	{
+		var handle = Native.GetForegroundWindow();
+
+		if (handle == IntPtr.Zero)
+		{
+			return null;
+		}
+
+		var ids = Native.GetProcessesOfChildWindows(handle);
+
+		Native.GetWindowThreadProcessId(handle, out var pid);
+		ids.Insert(0, pid);
+
+		var processes = ids.Distinct()
+						   .Select(x => Process.GetProcessById(x))
+						   .ToList();
+
+		try
+		{
+			var blah = ParentProcessUtilities.GetParentProcess(pid);
+			if (blah != null && blah.ProcessName != "explorer" && blah.ProcessName != "svchost")
+			{
+				processes.Add(blah);
+			}
+		}
+		catch
+		{
+		}
+
+		return processes;
+
+	}
+
+	public void ResetAll()
+	{
+		try
 		{
 			var deviceEnumerator = new MMDeviceEnumerator(Guid.NewGuid());
 
 			using var device = deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
 			using var manager = device.AudioSessionManager2;
 
-			var sessions = manager.Sessions;
+			foreach (var session in manager.Sessions)
-
-			var matchingSession = new ActiveAudioSessionWrapper();
-
-			foreach (var session in sessions)
 			{
-				var audioProcess = Process.GetProcessById((int)session.ProcessID);
+				session.SimpleAudioVolume.MasterVolume = 1;
-
+				session.SimpleAudioVolume.Mute = false;
-				if (processes.Any(x => x.Id == session.ProcessID || x.ProcessName == audioProcess?.ProcessName))
-				{
-					try
-					{
-						var displayName = audioProcess.MainModule.FileVersionInfo.FileDescription;
-						if(string.IsNullOrEmpty(displayName))
-						{
-							displayName = audioProcess.ProcessName;
-						}
-						matchingSession.DisplayName = displayName;
-					}
-					catch 
-					{
-						matchingSession.DisplayName ??= audioProcess.ProcessName;
-					}
-
-					matchingSession.ExecutablePath ??= audioProcess.MainModule.FileName;
-
-					//some apps like discord have multiple volume processes.
-					matchingSession.AddVolume(session.SimpleAudioVolume);
-				}
 			}
-			return matchingSession.Any() ? matchingSession : null;
 		}
-
+		catch { }
-		public ActiveAudioSessionWrapper GetActiveSession()
-		{
-			var processes = GetPossibleProcesses();
-
-            if (_currentProcesses == null || !_currentProcesses.SequenceEqual(processes))
-            {
-				_current = FindSession(processes);
-            }
-
-			_currentProcesses = processes;
-			return _current;
-		}
-
-		/// <summary>
-		/// Get the list of processes that might be currently selected
-		/// This includes getting the child window's processes
-		///
-		/// This helps to find the audo process for windows store apps whose process is "ApplicationFrameHost.exe"
-		///
-		/// The list may optionally include a parent process, because that helps thing steam to be more reliable because the steamwebhelper (ui) is a child of steam.exe
-		///
-		/// According to deej, getting the ForegroundWindow and enumerating steam windows should work, but it doesn't seem to work for me without including the parent process
-		/// https://github.com/omriharel/deej/blob/master/pkg/deej/util/util_windows.go#L22
-		/// 
-		/// but the parent process is sometimes useless (explorer, svchost, etc) so i filter some of them out because i felt like it when i wrote the code
-		///
-		/// I also experimented with grabbing the parent process and enumerating through the windows to see if that would help, but any time the parent process was an unexpected process (explorer) it could blow up. so i decided not to bother for now
-		/// </summary>
-		/// <returns></returns>
-		public List<Process> GetPossibleProcesses()
-		{
-			var handle = Native.GetForegroundWindow();
-
-			if (handle == IntPtr.Zero)
-			{
-				return null;
-			}
-
-			var ids = Native.GetProcessesOfChildWindows(handle);
-
-			Native.GetWindowThreadProcessId(handle, out var pid);
-			ids.Insert(0, pid);
-
-			var processes = ids.Distinct()
-							   .Select(x => Process.GetProcessById(x))
-							   .ToList();
-
-			try
-			{
-				var blah = ParentProcessUtilities.GetParentProcess(pid);
-				if (blah != null && blah.ProcessName != "explorer" && blah.ProcessName != "svchost")
-				{
-					processes.Add(blah);
-				}
-			}
-			catch
-			{
-			}
-
-			return processes;
-
-		}
-
 	}
+
+	public IAudioSession GetSystemSounds()
+	{
+		var deviceEnumerator = new MMDeviceEnumerator(Guid.NewGuid());
+
+		using var device = deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
+		using var manager = device.AudioSessionManager2;
+
+		var sessions = manager.Sessions;
+
+		foreach (var session in sessions)
+		{
+			if (session.IsSystemSoundsSession)
+			{
+				return new SystemSoundsAudioSession(session.SimpleAudioVolume);
+			}
+		}
+
+		return null;
+	}
+	public IAudioSession GetSystemVolume()
+	{
+		var deviceEnumerator = new MMDeviceEnumerator(Guid.NewGuid());
+
+		using var device = deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
+		return new SystemVolumeAudioSession(device.AudioEndpointVolume);
+	}
+
 }

src/FocusVolumeControl/AudioSessions/ActiveAudioSessionWrapper.cs

@@ -0,0 +1,82 @@
+using CoreAudio;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BarRaider.SdTools;
+using System.Drawing;
+
+namespace FocusVolumeControl.AudioSessions;
+
+public class ActiveAudioSessionWrapper : IAudioSession
+{
+	public string DisplayName { get; set; }
+	public string ExecutablePath { get; set; }
+	private List<SimpleAudioVolume> Volume { get; } = new List<SimpleAudioVolume>();
+
+	string _icon;
+
+	public string GetIcon()
+	{
+		if (string.IsNullOrEmpty(_icon))
+		{
+			try
+			{
+				var tmp = Icon.ExtractAssociatedIcon(ExecutablePath);
+				_icon = Tools.ImageToBase64(tmp.ToBitmap(), true);
+			}
+			catch
+			{
+				_icon = "Image/pluginIcon.png";
+			}
+		}
+		return _icon;
+	}
+
+	public bool Any()
+	{
+		return Volume.Any();
+	}
+	public int Count => Volume.Count;
+
+	public void AddVolume(SimpleAudioVolume volume)
+	{
+		Volume.Add(volume);
+	}
+
+	public void ToggleMute()
+	{
+		//when all volumes are muted, Volume.All will return true
+		//so we swap from muted to false (opposite of Volume.All)
+
+		//when any volumes are unmuted, Volume.All will return false
+		//so we set muted to true (opposite of Volume.All)
+
+		var muted = Volume.All(x => x.Mute);
+
+		Volume.ForEach(x => x.Mute = !muted);
+	}
+
+	public bool IsMuted()
+	{
+		return Volume.All(x => x.Mute);
+	}
+
+	public void IncrementVolumeLevel(int step, int ticks)
+	{
+		//if you have more than one volume. they will all get set based on the first volume control
+		var level = Volume.FirstOrDefault()?.MasterVolume ?? 0;
+
+		level += (0.01f * step) * ticks;
+		level = Math.Max(level, 0);
+		level = Math.Min(level, 1);
+
+		Volume.ForEach(x => x.MasterVolume = level);
+	}
+
+	public int GetVolumeLevel()
+	{
+		var level = Volume.FirstOrDefault()?.MasterVolume ?? 0;
+		return (int)(level * 100);
+	}
+
+}

src/FocusVolumeControl/AudioSessions/IAudioSession.cs

@@ -0,0 +1,16 @@
+namespace FocusVolumeControl.AudioSessions;
+
+public interface IAudioSession
+{
+	public string DisplayName { get; }
+
+	public string GetIcon();
+
+	public void ToggleMute();
+
+	public bool IsMuted();
+
+	public void IncrementVolumeLevel(int step, int ticks);
+
+	public int GetVolumeLevel();
+}

src/FocusVolumeControl/AudioSessions/SystemSoundsAudioSession.cs

@@ -0,0 +1,38 @@
+using CoreAudio;
+using System;
+
+namespace FocusVolumeControl.AudioSessions;
+
+internal class SystemSoundsAudioSession : IAudioSession
+{
+	public SystemSoundsAudioSession(SimpleAudioVolume volumeControl)
+	{
+		_volumeControl = volumeControl;
+	}
+
+	SimpleAudioVolume _volumeControl;
+
+	public string DisplayName => "System sounds";
+	public string GetIcon() => "Images/systemSounds";
+
+	public void ToggleMute()
+	{
+		_volumeControl.Mute = !_volumeControl.Mute;
+	}
+
+	public bool IsMuted() => _volumeControl.Mute;
+
+	public void IncrementVolumeLevel(int step, int ticks)
+	{
+		var level = _volumeControl.MasterVolume;
+
+		level += (0.01f * step) * ticks;
+		level = Math.Max(level, 0);
+		level = Math.Min(level, 1);
+
+		_volumeControl.MasterVolume = level;
+	}
+
+	public int GetVolumeLevel() => (int)(_volumeControl.MasterVolume * 100);
+
+}

src/FocusVolumeControl/AudioSessions/SystemVolumeAudioSession.cs

@@ -0,0 +1,38 @@
+using CoreAudio;
+using System;
+
+namespace FocusVolumeControl.AudioSessions;
+
+internal class SystemVolumeAudioSession : IAudioSession
+{
+	public SystemVolumeAudioSession(AudioEndpointVolume volumeControl)
+	{
+		_volumeControl = volumeControl;
+	}
+
+	AudioEndpointVolume _volumeControl;
+
+	public string DisplayName => "System Volume";
+	public string GetIcon() => "Images/actionIcon";
+
+	public void ToggleMute()
+	{
+		_volumeControl.Mute = !_volumeControl.Mute;
+	}
+
+	public bool IsMuted() => _volumeControl.Mute;
+
+	public void IncrementVolumeLevel(int step, int ticks)
+	{
+		var level = _volumeControl.MasterVolumeLevelScalar;
+
+		level += (0.01f * step) * ticks;
+		level = Math.Max(level, 0);
+		level = Math.Min(level, 1);
+
+		_volumeControl.MasterVolumeLevelScalar = level;
+	}
+
+	public int GetVolumeLevel() => (int)(_volumeControl.MasterVolumeLevelScalar * 100);
+
+}

src/FocusVolumeControl/DialAction.cs

@@ -1,113 +1,100 @@
 using BarRaider.SdTools;
 using BarRaider.SdTools.Payloads;
-using CoreAudio;
+using FocusVolumeControl.AudioSessions;
 using FocusVolumeControl.UI;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
-using System.Collections.Generic;
-using System.Data;
-using System.Diagnostics;
-using System.Drawing;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.ServiceModel.Description;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Threading;
 
-namespace FocusVolumeControl
+namespace FocusVolumeControl;
+
+[PluginActionId("com.dlprows.focusvolumecontrol.dialaction")]
+public class DialAction : EncoderBase
 {
-
+	private class PluginSettings
-	/*
-    todo:
-    link both discord processes
-    steam not detecting
-
-    long press reset
-
-    option for what to do when on app without sound
-
-     */
-
-
-	[PluginActionId("com.dlprows.focusvolumecontrol.dialaction")]
-	public class DialAction : EncoderBase
 	{
-		private class PluginSettings
+		[JsonProperty("fallbackBehavior")]
+		public FallbackBehavior FallbackBehavior { get; set; }
+
+		public static PluginSettings CreateDefaultSettings()
 		{
-			public static PluginSettings CreateDefaultSettings()
+			PluginSettings instance = new PluginSettings();
-			{
+			instance.FallbackBehavior = FallbackBehavior.SystemSounds;
-				PluginSettings instance = new PluginSettings();
+			return instance;
-				return instance;
+		}
-			}
+	}
+
+	private PluginSettings settings;
+
+	IntPtr _foregroundWindowChangedEvent;
+	Native.WinEventDelegate _delegate;
+
+	IAudioSession _currentAudioSession;
+	AudioHelper _audioHelper = new AudioHelper();
+
+	Thread _thread;
+	Dispatcher _dispatcher;
+
+	UIState _previousState;
+
+	public DialAction(ISDConnection connection, InitialPayload payload) : base(connection, payload)
+	{
+		if (payload.Settings == null || payload.Settings.Count == 0)
+		{
+			settings = PluginSettings.CreateDefaultSettings();
+			SaveSettings();
+		}
+		else
+		{
+			settings = payload.Settings.ToObject<PluginSettings>();
 		}
 
-		private PluginSettings settings;
+		_thread = new Thread(() =>
-
-		IntPtr _foregroundWindowChangedEvent;
-		Native.WinEventDelegate _delegate;
-
-		ActiveAudioSessionWrapper _currentAudioSession;
-		AudioHelper _audioHelper = new AudioHelper();
-
-		Thread _thread;
-		Dispatcher _dispatcher;
-
-		UIState _previousState;
-
-		public DialAction(ISDConnection connection, InitialPayload payload) : base(connection, payload)
 		{
-			if (payload.Settings == null || payload.Settings.Count == 0)
+			Logger.Instance.LogMessage(TracingLevel.DEBUG, "Registering for events");
-			{
+			_delegate = new Native.WinEventDelegate(WinEventProc);
-				settings = PluginSettings.CreateDefaultSettings();
+			_foregroundWindowChangedEvent = Native.RegisterForForegroundWindowChangedEvent(_delegate);
-				SaveSettings();
-			}
-			else
-			{
-				settings = payload.Settings.ToObject<PluginSettings>();
-			}
 
-			_thread = new Thread(() =>
+			Logger.Instance.LogMessage(TracingLevel.DEBUG, "Starting Dispatcher");
-			{
+			_dispatcher = Dispatcher.CurrentDispatcher;
-				Logger.Instance.LogMessage(TracingLevel.DEBUG, "Registering for events");
+			Dispatcher.Run();
-				_delegate = new Native.WinEventDelegate(WinEventProc);
+			Logger.Instance.LogMessage(TracingLevel.DEBUG, "Dispatcher Stopped");
-				_foregroundWindowChangedEvent = Native.RegisterForForegroundWindowChangedEvent(_delegate);
+		});
+		_thread.SetApartmentState(ApartmentState.STA);
+		_thread.Start();
 
-				Logger.Instance.LogMessage(TracingLevel.DEBUG, "Starting Dispatcher");
-				_dispatcher = Dispatcher.CurrentDispatcher;
-				Dispatcher.Run();
-				Logger.Instance.LogMessage(TracingLevel.DEBUG, "Dispatcher Stopped");
-			});
-			_thread.SetApartmentState(ApartmentState.STA);
-			_thread.Start();
 
+		_currentAudioSession = settings.FallbackBehavior == FallbackBehavior.SystemSounds ? _audioHelper.GetSystemSounds() : _audioHelper.GetSystemVolume();
+	}
+
+	public override async void DialDown(DialPayload payload)
+	{
+		//dial pressed down
+		Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Down");
+		await ToggleMuteAsync();
+	}
+
+	public override async void TouchPress(TouchpadPressPayload payload)
+	{
+		Logger.Instance.LogMessage(TracingLevel.INFO, "Touch Press");
+		if (payload.IsLongPress)
+		{
+			_audioHelper.ResetAll();
 		}
-
+		else
-		public override async void DialDown(DialPayload payload)
 		{
-			//dial pressed down
-			Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Down");
 			await ToggleMuteAsync();
 		}
+	}
 
-		public override async void TouchPress(TouchpadPressPayload payload)
+	async Task ToggleMuteAsync()
+	{
+		try
 		{
-			Logger.Instance.LogMessage(TracingLevel.INFO, "Touch Press");
-			if (payload.IsLongPress)
-			{
-				//todo: iterate through all sessions setting them back to 100 except the master volume
-			}
-			else
-			{
-				await ToggleMuteAsync();
-			}
-		}
 
-		async Task ToggleMuteAsync()
-		{
 			if (_currentAudioSession != null)
 			{
 				_currentAudioSession.ToggleMute();
@@ -118,11 +105,19 @@ namespace FocusVolumeControl
 				await Connection.ShowAlert();
 			}
 		}
-
+		catch (Exception ex)
-		public override async void DialRotate(DialRotatePayload payload)
+		{
+			await Connection.ShowAlert();
+			Logger.Instance.LogMessage(TracingLevel.ERROR, $"Unable to toggle mute: {ex.Message}");
+		}
+	}
+
+	public override async void DialRotate(DialRotatePayload payload)
+	{
+		Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Rotate");
+		//dial rotated. ticks positive for right, negative for left
+		try
 		{
-			Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Rotate");
-			//dial rotated. ticks positive for right, negative for left
 			if (_currentAudioSession != null)
 			{
 				_currentAudioSession.IncrementVolumeLevel(1, payload.Ticks);
@@ -133,89 +128,89 @@ namespace FocusVolumeControl
 				await Connection.ShowAlert();
 			}
 		}
-
+		catch (Exception ex)
-		public override void DialUp(DialPayload payload)
 		{
-			//dial unpressed
+			await Connection.ShowAlert();
-			Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Up");
+			Logger.Instance.LogMessage(TracingLevel.ERROR, $"Unable to toggle mute: {ex.Message}");
 		}
+	}
 
-		public override void Dispose()
+	public override void DialUp(DialPayload payload)
-		{
+	{
-			Logger.Instance.LogMessage(TracingLevel.DEBUG, "Disposing");
+		//dial unpressed
+		Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Up");
+	}
+
+	public override void Dispose()
+	{
+		Logger.Instance.LogMessage(TracingLevel.DEBUG, "Disposing");
             if(_foregroundWindowChangedEvent != IntPtr.Zero)
             {
                 Native.UnhookWinEvent(_foregroundWindowChangedEvent);
             }
-			_dispatcher.InvokeShutdown();
+		_dispatcher.InvokeShutdown();
+	}
+
+	public override async void OnTick()
+	{
+		//called once every 1000ms and can be used for updating the title/image of the key
+		var activeSession = _audioHelper.GetActiveSession(settings.FallbackBehavior);
+
+		if(activeSession != null)
+		{
+			_currentAudioSession = activeSession;
 		}
 
-		public override async void OnTick()
+		await UpdateStateIfNeeded();
-		{
+	}
-			//called once every 1000ms and can be used for updating the title/image fo the key
-			var activeSession = _audioHelper.GetActiveSession();
 
-			if (activeSession == null)
+	private async Task UpdateStateIfNeeded()
+	{
+		if (_currentAudioSession != null)
+		{
+
+			var uiState = new UIState(_currentAudioSession);
+
+			if ( _previousState != null && uiState != null &&
+				uiState.Title == _previousState.Title &&
+				uiState.Value.Value == _previousState.Value.Value &&
+				uiState.Value.Opacity == _previousState.Value.Opacity &&
+				uiState.Indicator.Value == _previousState.Indicator.Value &&
+				uiState.Indicator.Opacity == _previousState.Indicator.Opacity &&
+				uiState.icon.Value == _previousState.icon.Value &&
+				uiState.icon.Opacity == _previousState.icon.Opacity
+				)
 			{
-				//todo: something?
+				return;
-			}
-			else
-			{
-				_currentAudioSession = activeSession;
 			}
 
-			await UpdateStateIfNeeded();
+			await Connection.SetFeedbackAsync(uiState);
-		}
+			_previousState = uiState;
-
-		private async Task UpdateStateIfNeeded()
-		{
-			if (_currentAudioSession != null)
-			{
-
-				var uiState = UIState.Build(_currentAudioSession);
-
-				if ( _previousState != null && uiState != null &&
-					uiState.Title == _previousState.Title &&
-					uiState.Value.Value == _previousState.Value.Value &&
-					uiState.Value.Opacity == _previousState.Value.Opacity &&
-					uiState.Indicator.Value == _previousState.Indicator.Value &&
-					uiState.Indicator.Opacity == _previousState.Indicator.Opacity &&
-					uiState.icon.Value == _previousState.icon.Value &&
-					uiState.icon.Opacity == _previousState.icon.Opacity
-					)
-				{
-					return;
-				}
-
-				await Connection.SetFeedbackAsync(uiState);
-				_previousState = uiState;
-			}
 		}
+	}
 
 
-		public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload)
+	public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload)
-		{
+	{
-		}
+	}
 
 
-		public override void ReceivedSettings(ReceivedSettingsPayload payload)
+	public override void ReceivedSettings(ReceivedSettingsPayload payload)
-		{
+	{
-			Tools.AutoPopulateSettings(settings, payload.Settings);
+		Tools.AutoPopulateSettings(settings, payload.Settings);
-			SaveSettings();
+		SaveSettings();
-		}
+	}
 
-		private Task SaveSettings()
+	private Task SaveSettings()
-		{
+	{
-			return Connection.SetSettingsAsync(JObject.FromObject(settings));
+		return Connection.SetSettingsAsync(JObject.FromObject(settings));
-		}
+	}
 
 
         public void WinEventProc(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
         {
-			OnTick();
+		OnTick();
         }
 
 
-	}
-
 }

src/FocusVolumeControl/FallbackBehavior.cs

@@ -0,0 +1,8 @@
+namespace FocusVolumeControl;
+
+public enum FallbackBehavior
+{
+	SystemSounds,
+	PreviousApp,
+	SystemVolume
+}

src/FocusVolumeControl/FocusVolumeControl.csproj

@@ -54,13 +54,16 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ActiveAudioSessionWrapper.cs" />
+    <Compile Include="AudioSessions\ActiveAudioSessionWrapper.cs" />
     <Compile Include="AudioHelper.cs" />
+    <Compile Include="AudioSessions\SystemSoundsAudioSession.cs" />
+    <Compile Include="AudioSessions\SystemVolumeAudioSession.cs" />
     <Compile Include="DialAction.cs" />
-    <Compile Include="ISDConnectionExtensions.cs" />
+    <Compile Include="AudioSessions\IAudioSession.cs" />
+    <Compile Include="FallbackBehavior.cs" />
+    <Compile Include="UI\ISDConnectionExtensions.cs" />
     <Compile Include="Native.cs" />
     <Compile Include="ParentProcessUtilities.cs" />
-    <Compile Include="PluginAction.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UI\UIState.cs" />
@@ -74,42 +77,15 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Images\categoryIcon%402x.png">
+    <Content Include="$(SolutionDir)..\previews\**\*" Link="previews\%(Filename)%(Extension)">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Images\categoryIcon.png">
+    <Content Include="Images\**\*.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\actionIcon%402x.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\actionIcon.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\icon%402x.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\icon.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\pluginAction%402x.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\pluginAction.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\pluginIcon%402x.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\pluginIcon.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="PropertyInspector\PluginActionPI.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="PropertyInspector\PluginActionPI.js">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CoreAudio">
@@ -139,8 +115,4 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
+</Project>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>

src/FocusVolumeControl/ISDConnectionExtensions.cs

@@ -1,18 +0,0 @@
-using BarRaider.SdTools;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FocusVolumeControl
-{
-	internal static class ISDConnectionExtensions
-	{
-		public static async Task SetFeedbackAsync(this ISDConnection _this, object feedbackPayload)
-		{
-			await _this.SetFeedbackAsync(JObject.FromObject(feedbackPayload));
-		}
-	}
-}

src/FocusVolumeControl/Native.cs

@@ -1,64 +1,62 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace FocusVolumeControl
+namespace FocusVolumeControl;
+
+public class Native
 {
-	public class Native
+	public delegate void WinEventDelegate(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime);
+
+	[DllImport("user32.dll")]
+	static extern IntPtr SetWinEventHook(uint eventMin, uint eventMax, IntPtr hmodWinEventProc, WinEventDelegate lpfnWinEventProc, uint idProcess, uint idThread, uint dwFlags);
+
+	[DllImport("user32.dll")]
+	public static extern bool UnhookWinEvent(IntPtr hWinEventHook);
+
+
+	private const uint WINEVENT_OUTOFCONTEXT = 0;
+	private const uint EVENT_SYSTEM_FOREGROUND = 3;
+
+	public static IntPtr RegisterForForegroundWindowChangedEvent(WinEventDelegate dele) => SetWinEventHook(EVENT_SYSTEM_FOREGROUND, EVENT_SYSTEM_FOREGROUND, IntPtr.Zero, dele, 0, 0, WINEVENT_OUTOFCONTEXT);
+
+
+	[DllImport("user32.dll")]
+	public static extern IntPtr GetForegroundWindow();
+
+	[DllImport("user32.dll", SetLastError = true)]
+	public static extern uint GetWindowThreadProcessId(IntPtr hWnd, out int processId);
+
+	
+	private delegate bool EnumWindowProc(IntPtr hwnd, IntPtr lParam);
+
+	[DllImport("user32")]
+	[return: MarshalAs(UnmanagedType.Bool)]
+	private static extern bool EnumChildWindows(IntPtr window, EnumWindowProc callback, IntPtr lParam);
+
+
+	public static List<int> GetProcessesOfChildWindows(IntPtr windowHandle)
 	{
-		public delegate void WinEventDelegate(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime);
+		var ids = new List<int>();
 
-		[DllImport("user32.dll")]
+		if(windowHandle != IntPtr.Zero)
-		static extern IntPtr SetWinEventHook(uint eventMin, uint eventMax, IntPtr hmodWinEventProc, WinEventDelegate lpfnWinEventProc, uint idProcess, uint idThread, uint dwFlags);
-
-		[DllImport("user32.dll")]
-		public static extern bool UnhookWinEvent(IntPtr hWinEventHook);
-
-
-		private const uint WINEVENT_OUTOFCONTEXT = 0;
-		private const uint EVENT_SYSTEM_FOREGROUND = 3;
-
-		public static IntPtr RegisterForForegroundWindowChangedEvent(WinEventDelegate dele) => SetWinEventHook(EVENT_SYSTEM_FOREGROUND, EVENT_SYSTEM_FOREGROUND, IntPtr.Zero, dele, 0, 0, WINEVENT_OUTOFCONTEXT);
-
-
-		[DllImport("user32.dll")]
-		public static extern IntPtr GetForegroundWindow();
-
-		[DllImport("user32.dll", SetLastError = true)]
-		public static extern uint GetWindowThreadProcessId(IntPtr hWnd, out int processId);
-
-		
-		private delegate bool EnumWindowProc(IntPtr hwnd, IntPtr lParam);
-
-		[DllImport("user32")]
-		[return: MarshalAs(UnmanagedType.Bool)]
-		private static extern bool EnumChildWindows(IntPtr window, EnumWindowProc callback, IntPtr lParam);
-
-
-		public static List<int> GetProcessesOfChildWindows(IntPtr windowHandle)
 		{
-			var ids = new List<int>();
 
-			if(windowHandle != IntPtr.Zero)
+		EnumChildWindows(windowHandle,
-			{
+				(hWnd, lParam) => 
+				{
+					Native.GetWindowThreadProcessId(hWnd, out var pid);
+					ids.Add(pid);
 
-			EnumChildWindows(windowHandle,
+				return true;
-					(hWnd, lParam) => 
-					{
-						Native.GetWindowThreadProcessId(hWnd, out var pid);
-						ids.Add(pid);
 
-					return true;
+			}, IntPtr.Zero);
-
-				}, IntPtr.Zero);
-			}
-
-			return ids;
 		}
 
-
+		return ids;
 	}
+
+	[DllImport("ntdll.dll")]
+	public static extern int NtQueryInformationProcess(IntPtr processHandle, int processInformationClass, ref ParentProcessUtilities processInformation, int processInformationLength, out int returnLength);
+
 }

src/FocusVolumeControl/ParentProcessUtilities.cs

@@ -1,65 +1,57 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace FocusVolumeControl
+namespace FocusVolumeControl;
+
+/// <summary>
+/// A utility class to determine a process parent.
+/// </summary>
+[StructLayout(LayoutKind.Sequential)]
+public struct ParentProcessUtilities
 {
+	// These members must match PROCESS_BASIC_INFORMATION
+	internal IntPtr Reserved1;
+	internal IntPtr PebBaseAddress;
+	internal IntPtr Reserved2_0;
+	internal IntPtr Reserved2_1;
+	internal IntPtr UniqueProcessId;
+	internal IntPtr InheritedFromUniqueProcessId;
+
+	
 	/// <summary>
-	/// A utility class to determine a process parent.
+	/// Gets the parent process of specified process.
 	/// </summary>
-	[StructLayout(LayoutKind.Sequential)]
+	/// <param name="id">The process id.</param>
-	public struct ParentProcessUtilities
+	/// <returns>An instance of the Process class.</returns>
+	public static Process GetParentProcess(int id)
 	{
-		// These members must match PROCESS_BASIC_INFORMATION
+		var process = Process.GetProcessById(id);
-		internal IntPtr Reserved1;
+		return GetParentProcess(process);
-		internal IntPtr PebBaseAddress;
+	}
-		internal IntPtr Reserved2_0;
-		internal IntPtr Reserved2_1;
-		internal IntPtr UniqueProcessId;
-		internal IntPtr InheritedFromUniqueProcessId;
 
-		[DllImport("ntdll.dll")]
+	/// <summary>
-		private static extern int NtQueryInformationProcess(IntPtr processHandle, int processInformationClass, ref ParentProcessUtilities processInformation, int processInformationLength, out int returnLength);
+	/// Gets the parent process of a specified process.
-
+	/// </summary>
-		/// <summary>
+	/// <param name="handle">The process handle.</param>
-		/// Gets the parent process of specified process.
+	/// <returns>An instance of the Process class.</returns>
-		/// </summary>
+	public static Process GetParentProcess(Process process)
-		/// <param name="id">The process id.</param>
+	{
-		/// <returns>An instance of the Process class.</returns>
+		var data = new ParentProcessUtilities();
-		public static Process GetParentProcess(int id)
+		int status = Native.NtQueryInformationProcess(process.Handle, 0, ref data, Marshal.SizeOf(data), out var returnLength);
+		if (status != 0)
 		{
-			var process = Process.GetProcessById(id);
+			return null;
-			return GetParentProcess(process);
 		}
 
-		/// <summary>
+		try
-		/// Gets the parent process of a specified process.
-		/// </summary>
-		/// <param name="handle">The process handle.</param>
-		/// <returns>An instance of the Process class.</returns>
-		public static Process GetParentProcess(Process process)
 		{
-			var data = new ParentProcessUtilities();
+			return Process.GetProcessById(data.InheritedFromUniqueProcessId.ToInt32());
-			int status = NtQueryInformationProcess(process.Handle, 0, ref data, Marshal.SizeOf(data), out var returnLength);
+		}
-			if (status != 0)
+		catch
-			{
+		{
-				return null;
+			return null;
-			}
-
-			try
-			{
-				return Process.GetProcessById(data.InheritedFromUniqueProcessId.ToInt32());
-			}
-			catch
-			{
-				return null;
-			}
 		}
-
 	}
 
 }

src/FocusVolumeControl/PluginAction.cs

@@ -1,83 +0,0 @@
-using BarRaider.SdTools;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FocusVolumeControl
-{
-	[PluginActionId("FocusVolumeControl.pluginaction")]
-	public class PluginAction : KeypadBase
-	{
-		private class PluginSettings
-		{
-			public static PluginSettings CreateDefaultSettings()
-			{
-				PluginSettings instance = new PluginSettings();
-				instance.OutputFileName = String.Empty;
-				instance.InputString = String.Empty;
-				return instance;
-			}
-
-			[FilenameProperty]
-			[JsonProperty(PropertyName = "outputFileName")]
-			public string OutputFileName { get; set; }
-
-			[JsonProperty(PropertyName = "inputString")]
-			public string InputString { get; set; }
-		}
-
-		#region Private Members
-
-		private PluginSettings settings;
-
-		#endregion
-		public PluginAction(SDConnection connection, InitialPayload payload) : base(connection, payload)
-		{
-			if (payload.Settings == null || payload.Settings.Count == 0)
-			{
-				this.settings = PluginSettings.CreateDefaultSettings();
-				SaveSettings();
-			}
-			else
-			{
-				this.settings = payload.Settings.ToObject<PluginSettings>();
-			}
-		}
-
-		public override void Dispose()
-		{
-			Logger.Instance.LogMessage(TracingLevel.INFO, $"Destructor called");
-		}
-
-		public override void KeyPressed(KeyPayload payload)
-		{
-			Logger.Instance.LogMessage(TracingLevel.INFO, "Key Pressed");
-		}
-
-		public override void KeyReleased(KeyPayload payload) { }
-
-		public override void OnTick() { }
-
-		public override void ReceivedSettings(ReceivedSettingsPayload payload)
-		{
-			Tools.AutoPopulateSettings(settings, payload.Settings);
-			SaveSettings();
-		}
-
-		public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload) { }
-
-		#region Private Methods
-
-		private Task SaveSettings()
-		{
-			return Connection.SetSettingsAsync(JObject.FromObject(settings));
-		}
-
-		#endregion
-	}
-}

src/FocusVolumeControl/Program.cs

@@ -1,20 +1,14 @@
 using BarRaider.SdTools;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace FocusVolumeControl
+namespace FocusVolumeControl;
+
+internal class Program
 {
-	internal class Program
+	static void Main(string[] args)
 	{
-		static void Main(string[] args)
+		// Uncomment this line of code to allow for debugging
-		{
+		//while (!System.Diagnostics.Debugger.IsAttached) { System.Threading.Thread.Sleep(100); }
-			// Uncomment this line of code to allow for debugging
-			//while (!System.Diagnostics.Debugger.IsAttached) { System.Threading.Thread.Sleep(100); }
 
-			SDWrapper.Run(args);
+		SDWrapper.Run(args);
-		}
 	}
 }

src/FocusVolumeControl/PropertyInspector/PluginActionPI.html

@@ -8,10 +8,24 @@
     <title>FocusVolumeControl Settings</title>
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/barraider/streamdeck-easypi@latest/src/sdpi.css">
     <script src="https://cdn.jsdelivr.net/gh/barraider/streamdeck-easypi@latest/src/sdtools.common.js"></script>
-    <script src="PluginActionPI.js"></script>
 </head>
 <body>
     <div class="sdpi-wrapper">
+        <div class="sdpi-item">
+            <div class="sdpi-item-label">Fallback</div>
+            <select class="sdpi-item-value sdProperty" id="fallbackBehavior" oninput="setSettings()">
+                <option value="0">System Sounds</option>
+                <option value="1">Previous App</option>
+                <option value="2">Main System Volume</option>
+            </select>
+        </div>
+            <details>
+                <summary>Fallback Details</summary>
+                <p>If you look at windows volume mixer, you will see that not all applications can have their volume controlled. The fallback behavior controls what happens when you are in an application that doesn't show up in the volume mixer</p>
+                <p>* System Sounds - Switch to system sounds. This will control windows sound effects such as when an error sound plays. If you're in an application that is making beeping sounds, this will often allow you to control those sounds while leaving things like your music/videos alone</p>
+                <p>* Previous App - Use the last app that had a volume control. This can result in the stream deck not changing after you have quit an application.</p>
+                <p>* Main System Volume - Switch to the main volume control for the system. This will change the volume of all applications</p>
+           </details>
     </div>
 </body>
 </html>

src/FocusVolumeControl/PropertyInspector/PluginActionPI.js

@@ -1 +0,0 @@
-

src/FocusVolumeControl/UI/ISDConnectionExtensions.cs

@@ -0,0 +1,13 @@
+using BarRaider.SdTools;
+using Newtonsoft.Json.Linq;
+using System.Threading.Tasks;
+
+namespace FocusVolumeControl.UI;
+
+internal static class ISDConnectionExtensions
+{
+	public static async Task SetFeedbackAsync(this ISDConnection _this, object feedbackPayload)
+	{
+		await _this.SetFeedbackAsync(JObject.FromObject(feedbackPayload));
+	}
+}

src/FocusVolumeControl/UI/UIState.cs

@@ -8,58 +8,34 @@ using System.Text;
 using System.Threading.Tasks;
 using BarRaider.SdTools;
 using Newtonsoft.Json;
+using FocusVolumeControl.AudioSessions;
 
-namespace FocusVolumeControl.UI
+namespace FocusVolumeControl.UI;
+
+internal class UIState
 {
-	internal class UIState
+	[JsonProperty("title")]
+	public string Title { get; private init; }
+
+	[JsonProperty("value")]
+	public ValueWithOpacity<string> Value { get; private init; }
+
+	[JsonProperty("indicator")]
+	public ValueWithOpacity<float>Indicator { get; private init; }
+
+	[JsonProperty("icon")]
+	public ValueWithOpacity<string> icon { get; private init; }
+
+	public UIState(IAudioSession session)
 	{
-		[JsonProperty("title")]
+		var volume = session.GetVolumeLevel();
-		public string Title { get; private init; }
+		var opacity = session.IsMuted() ? 0.5f : 1;
-
+		var iconData = session.GetIcon();
-		[JsonProperty("value")]
-		public ValueWithOpacity<string> Value { get; private init; }
-
-		[JsonProperty("indicator")]
-		public ValueWithOpacity<float>Indicator { get; private init; }
-
-		[JsonProperty("icon")]
-		public ValueWithOpacity<string> icon { get; private init; }
-
-		public static UIState Build(ActiveAudioSessionWrapper session)
-		{
-			var volume = session.GetVolumeLevel();
-
-			var opacity = session.GetMuted() != true ? 1 : 0.5f;
-
-			var iconData = "";
-
-			if (session.Icon != null)
-			{
-				iconData = session.Icon;
-			}
-			else
-			{
-				try
-				{
-					var icon = Icon.ExtractAssociatedIcon(session.ExecutablePath);
-					iconData = Tools.ImageToBase64(icon.ToBitmap(), true);
-				}
-				catch
-				{
-					iconData = "Image/pluginIcon.png";
-				}
-				session.Icon = iconData;
-			}
-
-
-			return new UIState()
-			{
-				Title = session.DisplayName,
-				Value = new() { Value = $"{volume}%", Opacity = opacity },
-				Indicator = new() { Value = volume, Opacity = opacity },
-				icon = new() { Value = iconData, Opacity = opacity },
-			};
-		}
 
+		Title = session.DisplayName;
+		Value = new() { Value = $"{volume}%", Opacity = opacity };
+		Indicator = new() { Value = volume, Opacity = opacity };
+		icon = new() { Value = iconData, Opacity = opacity };
 	}
+
 }

src/FocusVolumeControl/UI/ValueWithOpacity.cs

@@ -1,20 +1,13 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Data.SqlTypes;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace FocusVolumeControl.UI
+namespace FocusVolumeControl.UI;
+
+internal class ValueWithOpacity<T>
 {
-	internal class ValueWithOpacity<T>
+	[JsonProperty("value")]
-	{
+	public required T Value { get; init; }
-		[JsonProperty("value")]
-		public required T Value { get; init; }
 
-		[JsonProperty("opacity")]
+	[JsonProperty("opacity")]
-		public required float Opacity { get; init; }
+	public required float Opacity { get; init; }
 
-	}
 }

src/FocusVolumeControl/manifest.json

@@ -18,9 +18,9 @@
         "StackColor": "#AABBCC",
         "TriggerDescription": {
           "Rotate": "Change the volume",
-          "Push": "Mute/UnMute",
+          "Push": "Mute",
-          "Touch": "Mute/UnMute",
+          "Touch": "Mute",
-          "LongTouch":  "Reset all apps"
+          "LongTouch":  "Reset"
         }
       },
       "SupportedInMultiActions": false,

src/SoundBrowser/MainWindow.xaml.cs

@@ -1,135 +1,118 @@
 using CoreAudio;
 using FocusVolumeControl;
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.Diagnostics;
-using System.Linq;
-using System.Management;
-using System.Runtime.InteropServices;
 using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
-namespace SoundBrowser
+namespace SoundBrowser;
+
+/// <summary>
+/// Interaction logic for MainWindow.xaml
+/// </summary>
+public partial class MainWindow : Window
 {
-	/// <summary>
+
-	/// Interaction logic for MainWindow.xaml
+	AudioHelper _audioHelper;
-	/// </summary>
+	Native.WinEventDelegate _delegate;
-	public partial class MainWindow : Window
+
+	public MainWindow()
 	{
+		InitializeComponent();
+		_audioHelper = new AudioHelper();
 
-		AudioHelper _audioHelper;
+		//normally you can just pass a lambda, but for some reason, that seems to get garbage collected
-		Native.WinEventDelegate _delegate;
+		_delegate = new Native.WinEventDelegate(WinEventProc);
-
+		Native.RegisterForForegroundWindowChangedEvent(_delegate);
-		public MainWindow()
-		{
-			InitializeComponent();
-			_audioHelper = new AudioHelper();
-
-			//normally you can just pass a lambda, but for some reason, that seems to get garbage collected
-			_delegate = new Native.WinEventDelegate(WinEventProc);
-			Native.RegisterForForegroundWindowChangedEvent(_delegate);
-		}
-
-		public void WinEventProc(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
-		{
-			SetupCurrentAppFields();
-			SetupAllSessionFields();
-		}
-
-		private void SetupCurrentAppFields()
-		{
-			var handle = Native.GetForegroundWindow();
-			var sb = new StringBuilder();
-
-			if (handle != IntPtr.Zero)
-			{
-				//use this in debug to help there be less events
-
-				/*
-				Native.GetWindowThreadProcessId(handle, out var fpid);
-				var fp = Process.GetProcessById(fpid);
-
-				if(!fp.ProcessName.Contains("FSD"))
-				{
-					return;
-				}
-				*/
-
-				var processes = _audioHelper.GetPossibleProcesses();
-				var session = _audioHelper.FindSession(processes);
-
-				foreach (var p in processes)
-				{
-
-					sb.AppendLine($"pid: {p.Id}");
-					sb.AppendLine($"\tprocessName: {p.ProcessName}");
-					try
-					{
-						sb.AppendLine($"\tFileDescription: {p!.MainModule!.FileVersionInfo.FileDescription}");
-					}
-					catch
-					{
-						sb.AppendLine("\tFileDescription: ##ERROR##");
-					}
-
-
-				}
-
-				sb.AppendLine();
-				if (session != null)
-				{
-					sb.AppendLine("picked the following best match");
-					sb.AppendLine($"\tsession: {session.DisplayName}");
-					sb.AppendLine($"\tvolume: {session.GetVolumeLevel()}");
-					sb.AppendLine($"\tcount: {session.Count}");
-				}
-				else
-				{
-					sb.AppendLine("No Match");
-				}
-			}
-
-			_tf.Text = sb.ToString();
-		}
-
-		private void SetupAllSessionFields()
-		{
-			_tf2.Text = "";
-			var sb = new StringBuilder();
-			sb.AppendLine("-------------------------------------------------------------------------------");
-
-			var deviceEnumerator = new MMDeviceEnumerator(Guid.NewGuid());
-
-			using var device = deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
-			using var manager = device.AudioSessionManager2;
-
-			var sessions = manager!.Sessions;
-
-			foreach (var session in sessions!)
-			{
-				var audioProcess = Process.GetProcessById((int)session.ProcessID);
-
-				var displayName = audioProcess!.MainModule!.FileVersionInfo.FileDescription;
-
-				sb.AppendLine($"pid: {audioProcess.Id}");
-				sb.AppendLine($"\tprocessName: {audioProcess.ProcessName}");
-				sb.AppendLine($"\tsession: {displayName}");
-			}
-
-			_tf2.Text = sb.ToString();
-		}
-
-
 	}
 
+	public void WinEventProc(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
+	{
+		SetupCurrentAppFields();
+		SetupAllSessionFields();
+	}
+
+	private void SetupCurrentAppFields()
+	{
+		var handle = Native.GetForegroundWindow();
+		var sb = new StringBuilder();
+
+		if (handle != IntPtr.Zero)
+		{
+			//use this in debug to help there be less events
+
+			/*
+			Native.GetWindowThreadProcessId(handle, out var fpid);
+			var fp = Process.GetProcessById(fpid);
+
+			if(!fp.ProcessName.Contains("FSD"))
+			{
+				return;
+			}
+			*/
+
+			var processes = _audioHelper.GetPossibleProcesses();
+			var session = _audioHelper.FindSession(processes);
+
+			foreach (var p in processes)
+			{
+
+				sb.AppendLine($"pid: {p.Id}");
+				sb.AppendLine($"\tprocessName: {p.ProcessName}");
+				try
+				{
+					sb.AppendLine($"\tFileDescription: {p!.MainModule!.FileVersionInfo.FileDescription}");
+				}
+				catch
+				{
+					sb.AppendLine("\tFileDescription: ##ERROR##");
+				}
+
+
+			}
+
+			sb.AppendLine();
+			if (session != null)
+			{
+				sb.AppendLine("picked the following best match");
+				sb.AppendLine($"\tsession: {session.DisplayName}");
+				sb.AppendLine($"\tvolume: {session.GetVolumeLevel()}");
+			}
+			else
+			{
+				sb.AppendLine("No Match");
+			}
+		}
+
+		_tf.Text = sb.ToString();
+	}
+
+	private void SetupAllSessionFields()
+	{
+		_tf2.Text = "";
+		var sb = new StringBuilder();
+		sb.AppendLine("-------------------------------------------------------------------------------");
+
+		var deviceEnumerator = new MMDeviceEnumerator(Guid.NewGuid());
+
+		using var device = deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
+		using var manager = device.AudioSessionManager2;
+
+		var sessions = manager!.Sessions;
+
+		foreach (var session in sessions!)
+		{
+			var audioProcess = Process.GetProcessById((int)session.ProcessID);
+
+			var displayName = audioProcess!.MainModule!.FileVersionInfo.FileDescription;
+
+			sb.AppendLine($"pid: {audioProcess.Id}");
+			sb.AppendLine($"\tprocessName: {audioProcess.ProcessName}");
+			sb.AppendLine($"\tsession: {displayName}");
+		}
+
+		_tf2.Text = sb.ToString();
+	}
+
+
 }

src/SoundBrowser/ParentProcessUtilities.cs

@@ -1,65 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SoundBrowser
-{
-	/// <summary>
-	/// A utility class to determine a process parent.
-	/// </summary>
-	[StructLayout(LayoutKind.Sequential)]
-	public struct ParentProcessUtilities
-	{
-		// These members must match PROCESS_BASIC_INFORMATION
-		internal IntPtr Reserved1;
-		internal IntPtr PebBaseAddress;
-		internal IntPtr Reserved2_0;
-		internal IntPtr Reserved2_1;
-		internal IntPtr UniqueProcessId;
-		internal IntPtr InheritedFromUniqueProcessId;
-
-		[DllImport("ntdll.dll")]
-		private static extern int NtQueryInformationProcess(IntPtr processHandle, int processInformationClass, ref ParentProcessUtilities processInformation, int processInformationLength, out int returnLength);
-
-		/// <summary>
-		/// Gets the parent process of specified process.
-		/// </summary>
-		/// <param name="id">The process id.</param>
-		/// <returns>An instance of the Process class.</returns>
-		public static Process? GetParentProcess(int id)
-		{
-			Process process = Process.GetProcessById(id);
-			return GetParentProcess(process.Handle);
-		}
-
-		/// <summary>
-		/// Gets the parent process of a specified process.
-		/// </summary>
-		/// <param name="handle">The process handle.</param>
-		/// <returns>An instance of the Process class.</returns>
-		public static Process? GetParentProcess(IntPtr handle)
-		{
-			ParentProcessUtilities pbi = new ParentProcessUtilities();
-			int returnLength;
-			int status = NtQueryInformationProcess(handle, 0, ref pbi, Marshal.SizeOf(pbi), out returnLength);
-			if (status != 0)
-				throw new Win32Exception(status);
-
-			try
-			{
-				return Process.GetProcessById(pbi.InheritedFromUniqueProcessId.ToInt32());
-			}
-			catch (ArgumentException)
-			{
-				// not found
-				return null;
-			}
-		}
-
-	}
-}