get the app output device

improved display name and icon support
fixed issues with games like halo master chief collection, which threw exceptions when getting the display name

LICENSE

@@ -2,8 +2,20 @@ MIT License
 
 Copyright (c) 2023 dlprows
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -1,2 +1,40 @@
-# 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/1-preview.png?raw=true)
+
+## Developing
+
+build the solution with visual studio
+download the [stream deck distribution tool](https://docs.elgato.com/sdk/plugins/packaging) to `src/FocusVolumeControl/`
+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 +0,0 @@
-using CoreAudio;
-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
-{
-	public class AudioHelper
-	{
-		ActiveAudioSessionWrapper _current;
-		List<Process> _currentProcesses;
-
-		public ActiveAudioSessionWrapper 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;
-		}
-
-		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;
-
-		}
-
-	}
-}

src/FocusVolumeControl/AudioHelpers/AppxPackage.cs

@@ -0,0 +1,327 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.ComTypes;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FocusVolumeControl.AudioHelpers;
+
+public sealed class AppxPackage
+{
+	private AppxPackage()
+	{
+	}
+
+	public string Path { get; private set; }
+	public string Logo { get; private set; }
+	public string DisplayName { get; private set; }
+
+	public static AppxPackage FromProcess(Process process)
+	{
+		try
+		{
+			return FromProcess(process.Handle);
+		}
+		catch
+		{
+			return null;
+		}
+	}
+
+	public static AppxPackage FromProcess(int processId)
+	{
+		const int QueryLimitedInformation = 0x1000;
+		IntPtr hProcess = OpenProcess(QueryLimitedInformation, false, processId);
+		try
+		{
+			return FromProcess(hProcess);
+		}
+		finally
+		{
+			if (hProcess != IntPtr.Zero)
+			{
+				CloseHandle(hProcess);
+			}
+		}
+	}
+
+	static AppxPackage FromProcess(IntPtr hProcess)
+	{
+		if (hProcess == IntPtr.Zero)
+		{
+			return null;
+		}
+
+		int len = 0;
+		GetPackageFullName(hProcess, ref len, null);
+		if (len == 0)
+		{
+			return null;
+		}
+
+		var sb = new StringBuilder(len);
+		string fullName = GetPackageFullName(hProcess, ref len, sb) == 0 ? sb.ToString() : null;
+		if (string.IsNullOrEmpty(fullName)) // not an AppX
+		{
+			return null;
+		}
+
+		var package = QueryPackageInfo(fullName, PackageConstants.PACKAGE_FILTER_HEAD).First();
+
+		return package;
+	}
+
+	private static IEnumerable<AppxPackage> QueryPackageInfo(string fullName, PackageConstants flags)
+	{
+		IntPtr infoRef;
+		OpenPackageInfoByFullName(fullName, 0, out infoRef);
+		if (infoRef != IntPtr.Zero)
+		{
+			IntPtr infoBuffer = IntPtr.Zero;
+			try
+			{
+				int len = 0;
+				int count;
+				GetPackageInfo(infoRef, flags, ref len, IntPtr.Zero, out count);
+				if (len > 0)
+				{
+					var factory = (IAppxFactory)new AppxFactory();
+					infoBuffer = Marshal.AllocHGlobal(len);
+					int res = GetPackageInfo(infoRef, flags, ref len, infoBuffer, out count);
+					for (int i = 0; i < count; i++)
+					{
+						var info = (PACKAGE_INFO)Marshal.PtrToStructure(infoBuffer + i * Marshal.SizeOf(typeof(PACKAGE_INFO)), typeof(PACKAGE_INFO));
+						var package = new AppxPackage();
+						package.Path = Marshal.PtrToStringUni(info.path);
+
+						// read manifest
+						string manifestPath = System.IO.Path.Combine(package.Path, "AppXManifest.xml");
+						const int STGM_SHARE_DENY_NONE = 0x40;
+
+						SHCreateStreamOnFileEx(manifestPath, STGM_SHARE_DENY_NONE, 0, false, IntPtr.Zero, out var strm);
+						if (strm != null)
+						{
+							var reader = factory.CreateManifestReader(strm);
+							var properties = reader.GetProperties();
+
+							properties.GetStringValue("DisplayName", out var displayName);
+
+							if(displayName.StartsWith("ms-resource:"))
+							{
+								var packageFullName = Marshal.PtrToStringUni(info.packageFullName);
+								displayName = LoadResourceString(fullName, displayName);
+
+							}
+							package.DisplayName = displayName;
+
+							properties.GetStringValue("Logo", out var logo);
+							package.Logo = logo;
+
+							/*
+							var apps = reader.GetApplications();
+							while (apps.GetHasCurrent())
+							{
+								var app = apps.GetCurrent();
+								var appx = new AppxApp(app);
+								appx.Description = GetStringValue(app, "Description");
+								appx.DisplayName = GetStringValue(app, "DisplayName");
+								appx.EntryPoint = GetStringValue(app, "EntryPoint");
+								appx.Executable = GetStringValue(app, "Executable");
+								appx.Id = GetStringValue(app, "Id");
+								appx.Logo = GetStringValue(app, "Logo");
+								appx.SmallLogo = GetStringValue(app, "SmallLogo");
+								appx.StartPage = GetStringValue(app, "StartPage");
+								appx.Square150x150Logo = GetStringValue(app, "Square150x150Logo");
+								appx.Square30x30Logo = GetStringValue(app, "Square30x30Logo");
+								appx.BackgroundColor = GetStringValue(app, "BackgroundColor");
+								appx.ForegroundText = GetStringValue(app, "ForegroundText");
+								appx.WideLogo = GetStringValue(app, "WideLogo");
+								appx.Wide310x310Logo = GetStringValue(app, "Wide310x310Logo");
+								appx.ShortName = GetStringValue(app, "ShortName");
+								appx.Square310x310Logo = GetStringValue(app, "Square310x310Logo");
+								appx.Square70x70Logo = GetStringValue(app, "Square70x70Logo");
+								appx.MinWidth = GetStringValue(app, "MinWidth");
+								package._apps.Add(appx);
+								apps.MoveNext();
+							}
+							*/
+							Marshal.ReleaseComObject(strm);
+						}
+						yield return package;
+					}
+					Marshal.ReleaseComObject(factory);
+				}
+			}
+			finally
+			{
+				if (infoBuffer != IntPtr.Zero)
+				{
+					Marshal.FreeHGlobal(infoBuffer);
+				}
+				ClosePackageInfo(infoRef);
+			}
+		}
+
+	}
+
+	static string LoadResourceString(string packageFullName, string resource)
+	{
+		if (packageFullName == null)
+			throw new ArgumentNullException("packageFullName");
+
+		if (string.IsNullOrWhiteSpace(resource))
+			return null;
+
+		const string resourceScheme = "ms-resource:";
+		if (!resource.StartsWith(resourceScheme))
+			return null;
+
+		string part = resource.Substring(resourceScheme.Length);
+		string url;
+
+		if (part.StartsWith("/"))
+		{
+			url = resourceScheme + "//" + part;
+		}
+		else
+		{
+			url = resourceScheme + "///resources/" + part;
+		}
+
+		string source = string.Format("@{{{0}? {1}}}", packageFullName, url);
+		var sb = new StringBuilder(1024);
+		int i = SHLoadIndirectString(source, sb, sb.Capacity, IntPtr.Zero);
+		if (i != 0)
+			return null;
+
+		return sb.ToString();
+	}
+
+
+	[Guid("5842a140-ff9f-4166-8f5c-62f5b7b0c781"), ComImport]
+	private class AppxFactory
+	{
+	}
+
+	[Guid("BEB94909-E451-438B-B5A7-D79E767B75D8"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	private interface IAppxFactory
+	{
+		void _VtblGap0_2(); // skip 2 methods
+		IAppxManifestReader CreateManifestReader(IStream inputStream);
+	}
+
+	[Guid("4E1BD148-55A0-4480-A3D1-15544710637C"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	private interface IAppxManifestReader
+	{
+		void _VtblGap0_1(); // skip 1 method
+		IAppxManifestProperties GetProperties();
+		void _VtblGap1_5(); // skip 5 methods
+		IAppxManifestApplicationsEnumerator GetApplications();
+	}
+
+	[Guid("9EB8A55A-F04B-4D0D-808D-686185D4847A"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	private interface IAppxManifestApplicationsEnumerator
+	{
+		IAppxManifestApplication GetCurrent();
+		bool GetHasCurrent();
+		bool MoveNext();
+	}
+
+	[Guid("5DA89BF4-3773-46BE-B650-7E744863B7E8"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	internal interface IAppxManifestApplication
+	{
+		[PreserveSig]
+		int GetStringValue([MarshalAs(UnmanagedType.LPWStr)] string name, [MarshalAs(UnmanagedType.LPWStr)] out string vaue);
+	}
+
+	[Guid("03FAF64D-F26F-4B2C-AAF7-8FE7789B8BCA"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	private interface IAppxManifestProperties
+	{
+		[PreserveSig]
+		int GetBoolValue([MarshalAs(UnmanagedType.LPWStr)] string name, out bool value);
+		[PreserveSig]
+		int GetStringValue([MarshalAs(UnmanagedType.LPWStr)] string name, [MarshalAs(UnmanagedType.LPWStr)] out string vaue);
+	}
+
+	[DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
+	private static extern int SHLoadIndirectString(string pszSource, StringBuilder pszOutBuf, int cchOutBuf, IntPtr ppvReserved);
+
+	[DllImport("shlwapi.dll", CharSet = CharSet.Unicode)]
+	private static extern int SHCreateStreamOnFileEx(string fileName, int grfMode, int attributes, bool create, IntPtr reserved, out IStream stream);
+
+	[DllImport("user32.dll")]
+	private static extern int GetWindowThreadProcessId(IntPtr hWnd, out int lpdwProcessId);
+
+	[DllImport("kernel32.dll")]
+	private static extern IntPtr OpenProcess(int dwDesiredAccess, bool bInheritHandle, int dwProcessId);
+
+	[DllImport("kernel32.dll")]
+	private static extern bool CloseHandle(IntPtr hObject);
+
+	[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+	private static extern int OpenPackageInfoByFullName(string packageFullName, int reserved, out IntPtr packageInfoReference);
+
+	[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+	private static extern int GetPackageInfo(IntPtr packageInfoReference, PackageConstants flags, ref int bufferLength, IntPtr buffer, out int count);
+
+	[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+	private static extern int ClosePackageInfo(IntPtr packageInfoReference);
+
+	[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
+	private static extern int GetPackageFullName(IntPtr hProcess, ref int packageFullNameLength, StringBuilder packageFullName);
+
+	[Flags]
+	private enum PackageConstants
+	{
+		PACKAGE_FILTER_ALL_LOADED = 0x00000000,
+		PACKAGE_PROPERTY_FRAMEWORK = 0x00000001,
+		PACKAGE_PROPERTY_RESOURCE = 0x00000002,
+		PACKAGE_PROPERTY_BUNDLE = 0x00000004,
+		PACKAGE_FILTER_HEAD = 0x00000010,
+		PACKAGE_FILTER_DIRECT = 0x00000020,
+		PACKAGE_FILTER_RESOURCE = 0x00000040,
+		PACKAGE_FILTER_BUNDLE = 0x00000080,
+		PACKAGE_INFORMATION_BASIC = 0x00000000,
+		PACKAGE_INFORMATION_FULL = 0x00000100,
+		PACKAGE_PROPERTY_DEVELOPMENT_MODE = 0x00010000,
+	}
+
+	[StructLayout(LayoutKind.Sequential, Pack = 4)]
+	private struct PACKAGE_INFO
+	{
+		public int reserved;
+		public int flags;
+		public IntPtr path;
+		public IntPtr packageFullName;
+		public IntPtr packageFamilyName;
+		public PACKAGE_ID packageId;
+	}
+
+	[StructLayout(LayoutKind.Sequential, Pack = 4)]
+	private struct PACKAGE_ID
+	{
+		public int reserved;
+		public AppxPackageArchitecture processorArchitecture;
+		public ushort VersionRevision;
+		public ushort VersionBuild;
+		public ushort VersionMinor;
+		public ushort VersionMajor;
+		public IntPtr name;
+		public IntPtr publisher;
+		public IntPtr resourceId;
+		public IntPtr publisherId;
+	}
+}
+
+public enum AppxPackageArchitecture
+{
+	x86 = 0,
+	Arm = 5,
+	x64 = 9,
+	Neutral = 11,
+	Arm64 = 12
+}

src/FocusVolumeControl/AudioHelpers/AudioHelper.cs

@@ -0,0 +1,422 @@
+using FocusVolumeControl.AudioSessions;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Runtime.InteropServices;
+
+namespace FocusVolumeControl.AudioHelpers;
+
+public class AudioHelper
+{
+	NameAndIconHelper _nameAndIconHelper = new NameAndIconHelper();
+
+	static object _lock = new object();
+	int[] _currentProcesses;
+	int _retryFallbackCount = 0;
+
+	public IAudioSession Current { get; private set; }
+
+	public void ResetCache()
+	{
+		lock (_lock)
+		{
+			Current = null;
+		}
+	}
+
+	private Process GetProcessById(int id)
+	{
+		try
+		{
+			return Process.GetProcessById(id);
+		}
+		catch
+		{
+			return null;
+		}
+	}
+
+	public IAudioSession FindSession(List<Process> processes)
+	{
+		//var blah = new AudioPolicyConfigFactoryImplFor21H2();
+		var results = new ActiveAudioSessionWrapper();
+		Process bestProcessMatch = null;
+
+		var deviceEnumerator = (IMMDeviceEnumerator)new MMDeviceEnumerator();
+
+		deviceEnumerator.EnumAudioEndpoints(DataFlow.Render, DeviceState.Active, out var deviceCollection);
+		deviceCollection.GetCount(out var numDevices);
+		for (int d = 0; d < numDevices; d++)
+		{
+			deviceCollection.Item(d, out var device);
+
+			Guid iid = typeof(IAudioSessionManager2).GUID;
+			device.Activate(ref iid, CLSCTX.ALL, IntPtr.Zero, out var m);
+			var manager = (IAudioSessionManager2)m;
+
+			device.GetId(out var currentDeviceId);
+
+			manager.GetSessionEnumerator(out var sessionEnumerator);
+
+			var currentIndex = int.MaxValue;
+
+			sessionEnumerator.GetCount(out var count);
+			for (int i = 0; i < count; i++)
+			{
+				sessionEnumerator.GetSession(i, out var session);
+
+				session.GetProcessId(out var sessionProcessId);
+				var audioProcess = GetProcessById(sessionProcessId);
+
+				if(audioProcess == null)
+				{
+					continue;
+				}
+
+				/*
+				blah.GetPersistedDefaultAudioEndpoint(sessionProcessId, DataFlow.Render, Role.Multimedia, out var persistedDeviceId);
+				persistedDeviceId = UnpackDeviceId(persistedDeviceId);
+				if(!string.IsNullOrEmpty(persistedDeviceId) && persistedDeviceId != currentDeviceId)
+				{
+					continue;
+
+				}
+				*/
+
+				var index = processes.FindIndex(x => x.Id == sessionProcessId || x.ProcessName == audioProcess?.ProcessName);
+
+				if (index > -1)
+				{
+					//processes will be ordered from best to worst (starts with the app, goes to parent)
+					//so we want the display name and executable path to come from the process that is closest to the front of the list
+					//but we want all matching sessions so things like discord work right
+					if (index < currentIndex)
+					{
+						bestProcessMatch = audioProcess;
+						currentIndex = index;
+
+						if(string.IsNullOrEmpty(results.DisplayName))
+						{
+							session.GetDisplayName(out var displayName);
+							results.DisplayName = displayName;
+						}
+					}
+
+
+					//some apps like discord have multiple volume processes.
+					//and some apps will be on multiple devices
+					//so we add all sessions so we can keep them in sync
+					results.AddSession(session);
+
+				}
+			}
+		}
+
+		if(bestProcessMatch != null)
+		{
+			_nameAndIconHelper.SetProcessInfo(bestProcessMatch, results);
+		}
+
+		return results.Any() ? results : null;
+	}
+
+	public IAudioSession GetActiveSession(FallbackBehavior fallbackBehavior)
+	{
+		lock (_lock)
+		{
+			var processes = GetPossibleProcesses();
+			var processIds = processes?.Select(x => x.Id).ToArray();
+
+			//_currentProcesses null - first time getting sessions
+			//_currentProcesses not equal to processIds - changed the active process
+			//_retryFallbackCount - some processes like chrome or minecraft will start their audio process when they first try to do some sound stuff
+			if (_currentProcesses == null || !_currentProcesses.SequenceEqual(processIds) || _retryFallbackCount == 5)
+			{
+				_retryFallbackCount = 0;
+				Current = FindSession(processes);
+			}
+			else if(Current is SystemSoundsAudioSession || Current is SystemVolumeAudioSession)
+			{
+				_retryFallbackCount++;
+			}
+
+			if (Current == null)
+			{
+				if (fallbackBehavior == FallbackBehavior.SystemSounds && Current is not SystemSoundsAudioSession)
+				{
+					Current = GetSystemSounds();
+				}
+				else if (fallbackBehavior == FallbackBehavior.SystemVolume && Current is not SystemVolumeAudioSession)
+				{
+					Current = GetSystemVolume();
+				}
+			}
+
+			_currentProcesses = processIds;
+			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 new List<Process>();
+		}
+
+		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();
+
+		if(processes.FirstOrDefault()?.ProcessName == "explorer")
+		{
+			return new List<Process>();
+		}
+
+		try
+		{
+			//note. in instances where you launch a game from steam. this ends up mapping the process to both steam and to the game. which is unfortunate
+			//The problem is that if you don't use the parent processes, then the actual steam window won't get recognized. But if you do, then games will map to steam.
+			//
+			//Additionally, I group all audio processes that match instead of just the most specific, or the first, etc. Because Discord uses two processes, one for voice chat, and one for discord sounds.
+			//
+			//Steam and Discord are both very common, and end up butting heads in the algorithm.
+			//I want to avoid special cases, but since steam and discord are both so common, i'm making an exception.
+			var parentProcess = ParentProcessUtilities.GetParentProcess(pid);
+			if (parentProcess != null 
+				&& parentProcess.ProcessName != "explorer" 
+				&& parentProcess.ProcessName != "svchost"
+				&& (parentProcess.ProcessName == "steam" && processes.Any(x => x.ProcessName == "steamwebhelper")) //only include steam if the parent process is the steamwebhelper
+				)
+			{
+				processes.Add(parentProcess);
+			}
+		}
+		catch
+		{
+		}
+
+		return processes;
+
+	}
+
+	public void ResetAll()
+	{
+		var deviceEnumerator = (IMMDeviceEnumerator)new MMDeviceEnumerator();
+
+		deviceEnumerator.EnumAudioEndpoints(DataFlow.Render, DeviceState.Active, out var deviceCollection);
+
+		deviceCollection.GetCount(out var numDevices);
+		for (int d = 0; d < numDevices; d++)
+		{
+			deviceCollection.Item(d, out var device);
+
+			Guid iid = typeof(IAudioSessionManager2).GUID;
+			device.Activate(ref iid, CLSCTX.ALL, IntPtr.Zero, out var m);
+			var manager = (IAudioSessionManager2)m;
+
+
+			manager.GetSessionEnumerator(out var sessionEnumerator);
+
+			sessionEnumerator.GetCount(out var count);
+			for (int i = 0; i < count; i++)
+			{
+				sessionEnumerator.GetSession(i, out var session);
+
+				var volume = (ISimpleAudioVolume)session;
+				var guid = Guid.Empty;
+				volume.SetMasterVolume(1, ref guid);
+				volume.SetMute(false, ref guid);
+			}
+		}
+	}
+
+	public IAudioSession GetSystemSounds()
+	{
+		var deviceEnumerator = (IMMDeviceEnumerator)new MMDeviceEnumerator();
+		deviceEnumerator.EnumAudioEndpoints(DataFlow.Render, DeviceState.Active, out var deviceCollection);
+
+		deviceCollection.GetCount(out var numDevices);
+		for (int d = 0; d < numDevices; d++)
+		{
+			deviceCollection.Item(d, out var device);
+
+
+			Guid iid = typeof(IAudioSessionManager2).GUID;
+			device.Activate(ref iid, CLSCTX.ALL, IntPtr.Zero, out var m);
+			var manager = (IAudioSessionManager2)m;
+
+
+			manager.GetSessionEnumerator(out var sessionEnumerator);
+
+			sessionEnumerator.GetCount(out var count);
+			for (int i = 0; i < count; i++)
+			{
+				sessionEnumerator.GetSession(i, out var session);
+
+				if (session.IsSystemSoundsSession() == 0)
+				{
+					return new SystemSoundsAudioSession(session);
+				}
+			}
+		}
+		return null;
+	}
+	public IAudioSession GetSystemVolume()
+	{
+		var deviceEnumerator = (IMMDeviceEnumerator)new MMDeviceEnumerator();
+
+		deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia, out var device);
+
+		Guid iid = typeof(IAudioEndpointVolume).GUID;
+		device.Activate(ref iid, CLSCTX.ALL, IntPtr.Zero, out var o);
+		var endpointVolume = (IAudioEndpointVolume)o;
+
+		return new SystemVolumeAudioSession(endpointVolume);
+	}
+
+
+
+
+	class AudioPolicyConfigFactoryImplFor21H2
+	{
+		private readonly IAudioPolicyConfigFactoryVariantFor21H2 _factory;
+
+		internal AudioPolicyConfigFactoryImplFor21H2()
+		{
+			var iid = typeof(IAudioPolicyConfigFactoryVariantFor21H2).GUID;
+			Combase.RoGetActivationFactory("Windows.Media.Internal.AudioPolicyConfig", ref iid, out object factory);
+			_factory = (IAudioPolicyConfigFactoryVariantFor21H2)factory;
+		}
+
+		public uint ClearAllPersistedApplicationDefaultEndpoints()
+		{
+			return _factory.ClearAllPersistedApplicationDefaultEndpoints();
+		}
+
+		public uint GetPersistedDefaultAudioEndpoint(int processId, DataFlow flow, Role role, out string deviceId)
+		{
+			return _factory.GetPersistedDefaultAudioEndpoint(processId, flow, role, out deviceId);
+		}
+
+		public uint SetPersistedDefaultAudioEndpoint(int processId, DataFlow flow, Role role, IntPtr deviceId)
+		{
+			return _factory.SetPersistedDefaultAudioEndpoint(processId, flow, role, deviceId);
+		}
+	}
+
+
+	[Guid("ab3d4648-e242-459f-b02f-541c70306324")]
+	[InterfaceType(ComInterfaceType.InterfaceIsIInspectable)]
+	public interface IAudioPolicyConfigFactoryVariantFor21H2
+	{
+		int __incomplete__add_CtxVolumeChange();
+		int __incomplete__remove_CtxVolumeChanged();
+		int __incomplete__add_RingerVibrateStateChanged();
+		int __incomplete__remove_RingerVibrateStateChange();
+		int __incomplete__SetVolumeGroupGainForId();
+		int __incomplete__GetVolumeGroupGainForId();
+		int __incomplete__GetActiveVolumeGroupForEndpointId();
+		int __incomplete__GetVolumeGroupsForEndpoint();
+		int __incomplete__GetCurrentVolumeContext();
+		int __incomplete__SetVolumeGroupMuteForId();
+		int __incomplete__GetVolumeGroupMuteForId();
+		int __incomplete__SetRingerVibrateState();
+		int __incomplete__GetRingerVibrateState();
+		int __incomplete__SetPreferredChatApplication();
+		int __incomplete__ResetPreferredChatApplication();
+		int __incomplete__GetPreferredChatApplication();
+		int __incomplete__GetCurrentChatApplications();
+		int __incomplete__add_ChatContextChanged();
+		int __incomplete__remove_ChatContextChanged();
+		[PreserveSig]
+		uint SetPersistedDefaultAudioEndpoint(int processId, DataFlow flow, Role role, IntPtr deviceId);
+		[PreserveSig]
+		uint GetPersistedDefaultAudioEndpoint(int processId, DataFlow flow, Role role, [Out, MarshalAs(UnmanagedType.HString)] out string deviceId);
+		[PreserveSig]
+		uint ClearAllPersistedApplicationDefaultEndpoints();
+	}
+
+	[Guid("2a59116d-6c4f-45e0-a74f-707e3fef9258")]
+	[InterfaceType(ComInterfaceType.InterfaceIsIInspectable)]
+	public interface IAudioPolicyConfigFactoryVariantForDownlevel
+	{
+		int __incomplete__add_CtxVolumeChange();
+		int __incomplete__remove_CtxVolumeChanged();
+		int __incomplete__add_RingerVibrateStateChanged();
+		int __incomplete__remove_RingerVibrateStateChange();
+		int __incomplete__SetVolumeGroupGainForId();
+		int __incomplete__GetVolumeGroupGainForId();
+		int __incomplete__GetActiveVolumeGroupForEndpointId();
+		int __incomplete__GetVolumeGroupsForEndpoint();
+		int __incomplete__GetCurrentVolumeContext();
+		int __incomplete__SetVolumeGroupMuteForId();
+		int __incomplete__GetVolumeGroupMuteForId();
+		int __incomplete__SetRingerVibrateState();
+		int __incomplete__GetRingerVibrateState();
+		int __incomplete__SetPreferredChatApplication();
+		int __incomplete__ResetPreferredChatApplication();
+		int __incomplete__GetPreferredChatApplication();
+		int __incomplete__GetCurrentChatApplications();
+		int __incomplete__add_ChatContextChanged();
+		int __incomplete__remove_ChatContextChanged();
+		[PreserveSig]
+		uint SetPersistedDefaultAudioEndpoint(int processId, DataFlow flow, Role role, IntPtr deviceId);
+		[PreserveSig]
+		uint GetPersistedDefaultAudioEndpoint(int processId, DataFlow flow, Role role, [Out, MarshalAs(UnmanagedType.HString)] out string deviceId);
+		[PreserveSig]
+		uint ClearAllPersistedApplicationDefaultEndpoints();
+	}
+
+	static class Combase
+	{
+		[DllImport("combase.dll", PreserveSig = false)]
+		public static extern void RoGetActivationFactory(
+			[MarshalAs(UnmanagedType.HString)] string activatableClassId,
+			[In] ref Guid iid,
+			[Out, MarshalAs(UnmanagedType.IInspectable)] out Object factory);
+
+		[DllImport("combase.dll", PreserveSig = false)]
+		public static extern void WindowsCreateString(
+			[MarshalAs(UnmanagedType.LPWStr)] string src,
+			[In] uint length,
+			[Out] out IntPtr hstring);
+	}
+
+	private const string DEVINTERFACE_AUDIO_RENDER = "#{e6327cad-dcec-4949-ae8a-991e976a79d2}";
+	private const string DEVINTERFACE_AUDIO_CAPTURE = "#{2eef81be-33fa-4800-9670-1cd474972c3f}";
+	private const string MMDEVAPI_TOKEN = @"\\?\SWD#MMDEVAPI#";
+	private string UnpackDeviceId(string deviceId)
+	{
+		if (deviceId.StartsWith(MMDEVAPI_TOKEN)) deviceId = deviceId.Remove(0, MMDEVAPI_TOKEN.Length);
+		if (deviceId.EndsWith(DEVINTERFACE_AUDIO_RENDER)) deviceId = deviceId.Remove(deviceId.Length - DEVINTERFACE_AUDIO_RENDER.Length);
+		if (deviceId.EndsWith(DEVINTERFACE_AUDIO_CAPTURE)) deviceId = deviceId.Remove(deviceId.Length - DEVINTERFACE_AUDIO_CAPTURE.Length);
+		return deviceId;
+	}
+
+
+}

src/FocusVolumeControl/AudioHelpers/NameAndIconHelper.cs

@@ -0,0 +1,138 @@
+using BarRaider.SdTools;
+using FocusVolumeControl.AudioSession;
+using FocusVolumeControl.AudioSessions;
+using FocusVolumeControl.UI;
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace FocusVolumeControl.AudioHelpers;
+
+public class NameAndIconHelper
+{
+	public string GetProcessInfo(Process process)
+	{
+		//i know this is dumb, but its only used by the sound browser, not real prod code
+		var blah = new ActiveAudioSessionWrapper();
+		SetProcessInfo(process, blah);
+		return blah.DisplayName;
+	}
+
+	public void SetProcessInfo(Process process, ActiveAudioSessionWrapper results)
+	{
+		try
+		{
+			//appx packages are installed from the windows store. eg, itunes
+			var appx = AppxPackage.FromProcess(process);
+			if (appx == null)
+			{
+				//using process.MainModule.FileVersionInfo sometimes throws permission exceptions
+				//we get the file version info with a limited query flag to avoid that
+				var fileVersionInfo = GetFileVersionInfo(process);
+
+				//if the display name is already set, then it came from the display name of the audio session
+				if (string.IsNullOrEmpty(results.DisplayName))
+				{
+					results.DisplayName = process.MainWindowTitle;
+
+					if (string.IsNullOrEmpty(results.DisplayName))
+					{
+						results.DisplayName = fileVersionInfo?.FileDescription;
+						if (string.IsNullOrEmpty(results.DisplayName))
+						{
+							results.DisplayName = process.ProcessName;
+						}
+					}
+				}
+
+				//for java apps (minecraft), the process will just have a java icon
+				//and there's not just a file that you can get the real icon from
+				//so you have to send some messages to the apps to get the icons.
+				//but they will only be 32x32 (or smaller) so we only want to use this logic for java
+				//because these will be lower resolution than the normal way of getting icons
+				if (process.ProcessName == "javaw" || process.ProcessName == "java" || process.ProcessName == "dotnet")
+				{
+					var windowHandle = process.MainWindowHandle;
+					var lazyIcon = () => JavaIconExtractor.GetWindowBigIconWithRetry(windowHandle);
+					results.IconWrapper = new RawIcon(windowHandle.ToString(), lazyIcon);
+
+				}
+				else
+				{
+					results.IconWrapper = new NormalIcon(fileVersionInfo?.FileName);
+				}
+			}
+			else
+			{
+				results.DisplayName = appx.DisplayName;
+				results.IconWrapper = new AppxIcon(Path.Combine(appx.Path, appx.Logo));
+			}
+		}
+		catch { }
+		finally
+		{
+			//if anything threw an exception, set the display name to the process name, and just let the
+			// icon/executable path be blank and the stream deck will just show the default icon
+			if (string.IsNullOrEmpty(results.DisplayName))
+			{
+				results.DisplayName = process.ProcessName;
+			}
+		}
+	}
+
+	FileVersionInfo GetFileVersionInfo(Process process)
+	{
+		var path = GetExecutablePathWithPInvoke(process);
+		if (!string.IsNullOrEmpty(path))
+		{
+			return FileVersionInfo.GetVersionInfo(path);
+		}
+		return null;
+	}
+
+	string GetExecutablePathWithPInvoke(Process process)
+	{
+		IntPtr processHandle = IntPtr.Zero;
+		try
+		{
+			string pathToExe = string.Empty;
+
+			if (process != null)
+			{
+				//use query limited information handle instead of process.handle to prevent permission errors
+				processHandle = Native.OpenProcess(0x00001000, false, process.Id);
+
+				var buffer = new StringBuilder(1024);
+				var bufferSize = (uint)buffer.Capacity + 1;
+				var success = Native.QueryFullProcessImageName(processHandle, 0, buffer, ref bufferSize);
+
+				if (success)
+				{
+					return buffer.ToString();
+				}
+				else
+				{
+					var error = Marshal.GetLastWin32Error();
+					Logger.Instance.LogMessage(TracingLevel.ERROR, $"Error = {error} getting process name");
+					return "";
+				}
+			}
+		}
+		catch
+		{
+		}
+		finally
+		{
+			if(processHandle != IntPtr.Zero)
+			{ 
+				Native.CloseHandle(processHandle);
+			}
+
+		}
+		return "";
+	}
+
+}

src/FocusVolumeControl/AudioHelpers/ParentProcessUtilities.cs

@@ -0,0 +1,57 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace FocusVolumeControl.AudioHelpers;
+
+/// <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>
+	/// 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)
+	{
+		var process = Process.GetProcessById(id);
+		return GetParentProcess(process);
+	}
+
+	/// <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(Process process)
+	{
+		var data = new ParentProcessUtilities();
+		int status = Native.NtQueryInformationProcess(process.Handle, 0, ref data, Marshal.SizeOf(data), out var returnLength);
+		if (status != 0)
+		{
+			return null;
+		}
+
+		try
+		{
+			return Process.GetProcessById(data.InheritedFromUniqueProcessId.ToInt32());
+		}
+		catch
+		{
+			return null;
+		}
+	}
+
+}

src/FocusVolumeControl/AudioSessions/ActiveAudioSessionWrapper.cs

@@ -0,0 +1,100 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using BarRaider.SdTools;
+using System.Drawing;
+using System.Runtime.InteropServices;
+using FocusVolumeControl.UI;
+using BitFaster.Caching.Lru;
+using FocusVolumeControl.AudioSession;
+
+namespace FocusVolumeControl.AudioSessions;
+
+public sealed class ActiveAudioSessionWrapper : IAudioSession
+{
+	public string DisplayName { get; set; }
+	private List<IAudioSessionControl2> Sessions { get; } = new List<IAudioSessionControl2>();
+	private IEnumerable<ISimpleAudioVolume> Volume => Sessions.Cast<ISimpleAudioVolume>();
+
+	public IconWrapper? IconWrapper { get; set; }
+
+	public string GetIcon()
+	{
+		try
+		{
+			return IconWrapper?.GetIconData() ?? IconWrapper.FallbackIconData;
+		}
+		catch
+		{
+			return IconWrapper.FallbackIconData;
+		}
+	}
+
+	public bool Any()
+	{
+		return Volume.Any();
+	}
+	public int Count => Sessions.Count;
+
+	public void AddSession(IAudioSessionControl2 session)
+	{
+		Sessions.Add(session);
+	}
+
+	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 = IsMuted();
+
+		foreach(var v in Volume)
+		{
+			var guid = Guid.Empty;
+			v.SetMute(!muted, ref guid);
+		}
+	}
+
+	public bool IsMuted()
+	{
+		return Volume.All(x =>
+		{
+			x.GetMute(out var mute); 
+			return 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 volume = Volume.FirstOrDefault();
+		var level = 0f;
+		if (volume != null)
+		{
+			volume.GetMasterVolume(out level);
+		}
+	
+		level = VolumeHelpers.GetAdjustedVolume(level, step, ticks);
+
+		foreach(var v in Volume)
+		{
+			var guid = Guid.Empty;
+			v.SetMasterVolume(level, ref guid);
+		}
+	}
+
+	public int GetVolumeLevel()
+	{
+		var volume = Volume.FirstOrDefault();
+		var level = 0f;
+		if(volume != null)
+		{
+			volume.GetMasterVolume(out level);
+		}
+
+		return VolumeHelpers.GetVolumePercentage(level);
+	}
+}

src/FocusVolumeControl/AudioSessions/CoreAudio.cs

@@ -0,0 +1,368 @@
+using System;
+using System.Data;
+using System.Runtime.InteropServices;
+
+namespace FocusVolumeControl.AudioSessions;
+
+
+[ComImport]
+[Guid("BCDE0395-E52F-467C-8E3D-C4579291692E")]
+public class MMDeviceEnumerator
+{
+}
+
+[Flags]
+public enum CLSCTX : uint
+{
+	INPROC_SERVER = 0x1,
+	INPROC_HANDLER = 0x2,
+	LOCAL_SERVER = 0x4,
+	INPROC_SERVER16 = 0x8,
+	REMOTE_SERVER = 0x10,
+	INPROC_HANDLER16 = 0x20,
+	RESERVED1 = 0x40,
+	RESERVED2 = 0x80,
+	RESERVED3 = 0x100,
+	RESERVED4 = 0x200,
+	NO_CODE_DOWNLOAD = 0x400,
+	RESERVED5 = 0x800,
+	NO_CUSTOM_MARSHAL = 0x1000,
+	ENABLE_CODE_DOWNLOAD = 0x2000,
+	NO_FAILURE_LOG = 0x4000,
+	DISABLE_AAA = 0x8000,
+	ENABLE_AAA = 0x10000,
+	FROM_DEFAULT_CONTEXT = 0x20000,
+	INPROC = INPROC_SERVER | INPROC_HANDLER,
+	SERVER = INPROC_SERVER | LOCAL_SERVER | REMOTE_SERVER,
+	ALL = SERVER | INPROC_HANDLER
+}
+
+public enum DataFlow
+{
+	Render,
+	Capture,
+	All,
+}
+
+public enum Role
+{
+	Console,
+	Multimedia,
+	Communications,
+}
+
+[Flags]
+public enum DeviceState : uint
+{
+	Active = 1 << 0,
+	Disabled = 1 << 1,
+	NotPresent = 1 << 2,
+	Unplugged = 1 << 3,
+	MaskAll = 0xFu
+}
+
+public enum AudioSessionState
+{
+	AudioSessionStateInactive = 0,
+	AudioSessionStateActive = 1,
+	AudioSessionStateExpired = 2
+}
+
+
+[Guid("0BD7A1BE-7A1A-44DB-8397-CC5392387B5E")]
+[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IMMDeviceCollection
+{
+	[PreserveSig]
+	int GetCount(out int nDevices);
+
+	[PreserveSig]
+	int Item(int nDevice, out IMMDevice Device);
+}
+
+[Guid("A95664D2-9614-4F35-A746-DE8DB63617E6"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IMMDeviceEnumerator
+{
+
+	[PreserveSig]
+	int EnumAudioEndpoints(DataFlow dataFlow, DeviceState StateMask, out IMMDeviceCollection deviceCollection);
+
+	[PreserveSig]
+	int GetDefaultAudioEndpoint(DataFlow dataFlow, Role role, out IMMDevice device);
+}
+
+[Guid("D666063F-1587-4E43-81F1-B948E807363F"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IMMDevice
+{
+	[PreserveSig]
+	int Activate(ref Guid iid, CLSCTX dwClsCtx, IntPtr pActivationParams, [MarshalAs(UnmanagedType.IUnknown)] out object ppInterface);
+
+	[PreserveSig]
+	int NotImpl1();
+	[PreserveSig]
+	int GetId([Out, MarshalAs(UnmanagedType.LPWStr)] out string ppstrId);
+
+}
+
+[Guid("77AA99A0-1BD6-484F-8BC7-2C654C9A9B6F"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAudioSessionManager2
+{
+	int NotImpl1();
+	int NotImpl2();
+
+	[PreserveSig]
+	int GetSessionEnumerator(out IAudioSessionEnumerator SessionEnum);
+}
+
+[Guid("E2F5BB11-0570-40CA-ACDD-3AA01277DEE8"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAudioSessionEnumerator
+{
+	[PreserveSig]
+	int GetCount(out int SessionCount);
+
+	[PreserveSig]
+	int GetSession(int SessionCount, out IAudioSessionControl2 Session);
+}
+
+[Guid("87CE5498-68D6-44E5-9215-6DA47EF883D8"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface ISimpleAudioVolume
+{
+	[PreserveSig]
+	int SetMasterVolume(float fLevel, ref Guid EventContext);
+
+	[PreserveSig]
+	int GetMasterVolume(out float pfLevel);
+
+	[PreserveSig]
+	int SetMute(bool bMute, ref Guid EventContext);
+
+	[PreserveSig]
+	int GetMute(out bool pbMute);
+}
+
+[Guid("bfb7ff88-7239-4fc9-8fa2-07c950be9c6d"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAudioSessionControl2
+{
+	//elgato seems to use this to determine whether the icon should be black and white
+	[PreserveSig]
+	int GetState(out AudioSessionState audioSessionState);
+
+	[PreserveSig]
+	int GetDisplayName([MarshalAs(UnmanagedType.LPWStr)] out string pRetVal);
+
+	[PreserveSig]
+	int SetDisplayName([MarshalAs(UnmanagedType.LPWStr)] string Value, [MarshalAs(UnmanagedType.LPStruct)] Guid EventContext);
+
+	[PreserveSig]
+	int GetIconPath([MarshalAs(UnmanagedType.LPWStr)] out string pRetVal);
+
+	[PreserveSig]
+	int SetIconPath([MarshalAs(UnmanagedType.LPWStr)] string Value, [MarshalAs(UnmanagedType.LPStruct)] Guid EventContext);
+
+	[PreserveSig]
+	int GetGroupingParam(out Guid pRetVal);
+
+	[PreserveSig]
+	int SetGroupingParam([MarshalAs(UnmanagedType.LPStruct)] Guid Override, [MarshalAs(UnmanagedType.LPStruct)] Guid EventContext);
+
+	[PreserveSig]
+	int NotImpl1();
+
+	[PreserveSig]
+	int NotImpl2();
+
+	// IAudioSessionControl2
+	[PreserveSig]
+	uint GetSessionIdentifier([MarshalAs(UnmanagedType.LPWStr)] out string pRetVal);
+
+	[PreserveSig]
+	int GetSessionInstanceIdentifier([MarshalAs(UnmanagedType.LPWStr)] out string pRetVal);
+
+	[PreserveSig]
+	int GetProcessId(out int pRetVal);
+
+	[PreserveSig]
+	int IsSystemSoundsSession();
+
+	[PreserveSig]
+	int SetDuckingPreference(bool optOut);
+}
+
+// http://netcoreaudio.codeplex.com/SourceControl/latest#trunk/Code/CoreAudio/Interfaces/IAudioEndpointVolume.cs
+[Guid("5CDF2C82-841E-4546-9722-0CF74078229A"), InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+public interface IAudioEndpointVolume
+{
+	[PreserveSig]
+	int NotImpl1();
+
+	[PreserveSig]
+	int NotImpl2();
+
+	/// <summary>
+	/// Gets a count of the channels in the audio stream.
+	/// </summary>
+	/// <param name="channelCount">The number of channels.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int GetChannelCount(
+		[Out][MarshalAs(UnmanagedType.U4)] out UInt32 channelCount);
+
+	/// <summary>
+	/// Sets the master volume level of the audio stream, in decibels.
+	/// </summary>
+	/// <param name="level">The new master volume level in decibels.</param>
+	/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int SetMasterVolumeLevel(
+		[In][MarshalAs(UnmanagedType.R4)] float level,
+		[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
+
+	/// <summary>
+	/// Sets the master volume level, expressed as a normalized, audio-tapered value.
+	/// </summary>
+	/// <param name="level">The new master volume level expressed as a normalized value between 0.0 and 1.0.</param>
+	/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int SetMasterVolumeLevelScalar(
+		[In][MarshalAs(UnmanagedType.R4)] float level,
+		[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
+
+	/// <summary>
+	/// Gets the master volume level of the audio stream, in decibels.
+	/// </summary>
+	/// <param name="level">The volume level in decibels.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int GetMasterVolumeLevel(
+		[Out][MarshalAs(UnmanagedType.R4)] out float level);
+
+	/// <summary>
+	/// Gets the master volume level, expressed as a normalized, audio-tapered value.
+	/// </summary>
+	/// <param name="level">The volume level expressed as a normalized value between 0.0 and 1.0.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int GetMasterVolumeLevelScalar(
+		[Out][MarshalAs(UnmanagedType.R4)] out float level);
+
+	/// <summary>
+	/// Sets the volume level, in decibels, of the specified channel of the audio stream.
+	/// </summary>
+	/// <param name="channelNumber">The channel number.</param>
+	/// <param name="level">The new volume level in decibels.</param>
+	/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int SetChannelVolumeLevel(
+		[In][MarshalAs(UnmanagedType.U4)] UInt32 channelNumber,
+		[In][MarshalAs(UnmanagedType.R4)] float level,
+		[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
+
+	/// <summary>
+	/// Sets the normalized, audio-tapered volume level of the specified channel in the audio stream.
+	/// </summary>
+	/// <param name="channelNumber">The channel number.</param>
+	/// <param name="level">The new master volume level expressed as a normalized value between 0.0 and 1.0.</param>
+	/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int SetChannelVolumeLevelScalar(
+		[In][MarshalAs(UnmanagedType.U4)] UInt32 channelNumber,
+		[In][MarshalAs(UnmanagedType.R4)] float level,
+		[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
+
+	/// <summary>
+	/// Gets the volume level, in decibels, of the specified channel in the audio stream.
+	/// </summary>
+	/// <param name="channelNumber">The zero-based channel number.</param>
+	/// <param name="level">The volume level in decibels.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int GetChannelVolumeLevel(
+		[In][MarshalAs(UnmanagedType.U4)] UInt32 channelNumber,
+		[Out][MarshalAs(UnmanagedType.R4)] out float level);
+
+	/// <summary>
+	/// Gets the normalized, audio-tapered volume level of the specified channel of the audio stream.
+	/// </summary>
+	/// <param name="channelNumber">The zero-based channel number.</param>
+	/// <param name="level">The volume level expressed as a normalized value between 0.0 and 1.0.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int GetChannelVolumeLevelScalar(
+		[In][MarshalAs(UnmanagedType.U4)] UInt32 channelNumber,
+		[Out][MarshalAs(UnmanagedType.R4)] out float level);
+
+	/// <summary>
+	/// Sets the muting state of the audio stream.
+	/// </summary>
+	/// <param name="isMuted">True to mute the stream, or false to unmute the stream.</param>
+	/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int SetMute(
+		[In][MarshalAs(UnmanagedType.Bool)] Boolean isMuted,
+		[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
+
+	/// <summary>
+	/// Gets the muting state of the audio stream.
+	/// </summary>
+	/// <param name="isMuted">The muting state. True if the stream is muted, false otherwise.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int GetMute(
+		[Out][MarshalAs(UnmanagedType.Bool)] out Boolean isMuted);
+
+	/// <summary>
+	/// Gets information about the current step in the volume range.
+	/// </summary>
+	/// <param name="step">The current zero-based step index.</param>
+	/// <param name="stepCount">The total number of steps in the volume range.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int GetVolumeStepInfo(
+		[Out][MarshalAs(UnmanagedType.U4)] out UInt32 step,
+		[Out][MarshalAs(UnmanagedType.U4)] out UInt32 stepCount);
+
+	/// <summary>
+	/// Increases the volume level by one step.
+	/// </summary>
+	/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int VolumeStepUp(
+		[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
+
+	/// <summary>
+	/// Decreases the volume level by one step.
+	/// </summary>
+	/// <param name="eventContext">A user context value that is passed to the notification callback.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int VolumeStepDown(
+		[In][MarshalAs(UnmanagedType.LPStruct)] Guid eventContext);
+
+	/// <summary>
+	/// Queries the audio endpoint device for its hardware-supported functions.
+	/// </summary>
+	/// <param name="hardwareSupportMask">A hardware support mask that indicates the capabilities of the endpoint.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int QueryHardwareSupport(
+		[Out][MarshalAs(UnmanagedType.U4)] out UInt32 hardwareSupportMask);
+
+	/// <summary>
+	/// Gets the volume range of the audio stream, in decibels.
+	/// </summary>
+	/// <param name="volumeMin">The minimum volume level in decibels.</param>
+	/// <param name="volumeMax">The maximum volume level in decibels.</param>
+	/// <param name="volumeStep">The volume increment level in decibels.</param>
+	/// <returns>An HRESULT code indicating whether the operation passed of failed.</returns>
+	[PreserveSig]
+	int GetVolumeRange(
+		[Out][MarshalAs(UnmanagedType.R4)] out float volumeMin,
+		[Out][MarshalAs(UnmanagedType.R4)] out float volumeMax,
+		[Out][MarshalAs(UnmanagedType.R4)] out float volumeStep);
+}

src/FocusVolumeControl/AudioSessions/IAudioSession.cs

@@ -0,0 +1,18 @@
+using System;
+
+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/IconWrapper.cs

@@ -0,0 +1,103 @@
+using BarRaider.SdTools;
+using BitFaster.Caching.Lru;
+using FocusVolumeControl.UI;
+using System;
+using System.Drawing;
+
+namespace FocusVolumeControl.AudioSession
+{
+	public abstract class IconWrapper
+	{
+		protected static ConcurrentLru<string, string> _iconCache = new ConcurrentLru<string, string>(10);
+
+		public abstract string GetIconData();
+
+		internal const string FallbackIconData = "Images/encoderIcon";
+	}
+
+	internal class AppxIcon : IconWrapper
+	{
+		private readonly string _iconPath;
+
+		public AppxIcon(string iconPath)
+		{
+			_iconPath = iconPath;
+		}
+
+		public override string GetIconData()
+		{
+			if(string.IsNullOrEmpty(_iconPath))
+			{
+				return FallbackIconData;
+			}
+
+			return _iconCache.GetOrAdd(_iconPath, (key) =>
+			{
+				var tmp = (Bitmap)Bitmap.FromFile(_iconPath);
+				tmp.MakeTransparent();
+				return Tools.ImageToBase64(tmp, true);
+			});
+		}
+
+	}
+
+	internal class NormalIcon : IconWrapper
+	{
+		private readonly string _iconPath;
+
+		public NormalIcon(string iconPath)
+		{
+			_iconPath = iconPath;
+		}
+
+		public override string GetIconData()
+		{
+			if(string.IsNullOrEmpty(_iconPath))
+			{
+				return FallbackIconData;
+			}
+
+			return _iconCache.GetOrAdd(_iconPath, (key) =>
+			{
+				var tmp = IconExtraction.GetIcon(_iconPath);
+				return Tools.ImageToBase64(tmp, true);
+			});
+		}
+	}
+
+	internal class RawIcon : IconWrapper
+	{
+		private readonly string _data;
+
+		public RawIcon(string name, Func<Bitmap?> getIcon)
+		{
+			_data = _iconCache.GetOrAdd(name, (key) =>
+			{
+				var icon = getIcon();
+				if (icon == null)
+				{
+					return FallbackIconData;
+				}
+
+				if (icon.Height < 48 && icon.Width < 48)
+				{
+					using var newImage = new Bitmap(48, 48);
+					newImage.MakeTransparent();
+					using var graphics = Graphics.FromImage(newImage);
+
+					graphics.DrawImage(icon, 4, 4, 40, 40);
+
+
+					return Tools.ImageToBase64(newImage, true);
+				}
+				else
+				{
+					return Tools.ImageToBase64(icon, true);
+				}
+			});
+		}
+
+		public override string GetIconData() => _data;
+	}
+
+}

src/FocusVolumeControl/AudioSessions/SystemSoundsAudioSession.cs

@@ -0,0 +1,46 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace FocusVolumeControl.AudioSessions;
+
+internal sealed class SystemSoundsAudioSession : IAudioSession
+{
+	public SystemSoundsAudioSession(IAudioSessionControl2 sessionControl)
+	{
+		_sessionControl = sessionControl;
+		_volumeControl = (ISimpleAudioVolume)sessionControl;
+	}
+
+	IAudioSessionControl2 _sessionControl;
+	ISimpleAudioVolume _volumeControl;
+
+	public string DisplayName => "System sounds";
+	public string GetIcon() => "Images/systemSounds";
+
+	public void ToggleMute()
+	{
+		var guid = Guid.Empty;
+		_volumeControl.SetMute(!IsMuted(), ref guid);
+	}
+
+	public bool IsMuted()
+	{
+		_volumeControl.GetMute(out var mute);
+		return mute;
+	}
+
+	public void IncrementVolumeLevel(int step, int ticks)
+	{
+		_volumeControl.GetMasterVolume(out var level);
+		level = VolumeHelpers.GetAdjustedVolume(level, step, ticks);
+
+		var guid = Guid.Empty;
+		_volumeControl.SetMasterVolume(level, ref guid);
+	}
+
+	public int GetVolumeLevel()
+	{
+		_volumeControl.GetMasterVolume(out var level);
+		return VolumeHelpers.GetVolumePercentage(level);
+	}
+}

src/FocusVolumeControl/AudioSessions/SystemVolumeAudioSession.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace FocusVolumeControl.AudioSessions;
+
+internal sealed class SystemVolumeAudioSession : IAudioSession
+{
+	public SystemVolumeAudioSession(IAudioEndpointVolume volumeControl)
+	{
+		_volumeControl = volumeControl;
+	}
+
+	IAudioEndpointVolume _volumeControl;
+
+	public string DisplayName => "System Volume";
+	public string GetIcon() => "Images/encoderIcon";
+
+	public void ToggleMute()
+	{
+		_volumeControl.SetMute(!IsMuted(), Guid.Empty);
+	}
+
+	public bool IsMuted()
+	{
+		_volumeControl.GetMute(out var mute);
+		return mute;
+	}
+
+	public void IncrementVolumeLevel(int step, int ticks)
+	{
+		_volumeControl.GetMasterVolumeLevelScalar(out var level);
+		level = VolumeHelpers.GetAdjustedVolume(level, step, ticks);
+		_volumeControl.SetMasterVolumeLevelScalar(level, Guid.Empty);
+	}
+
+	public int GetVolumeLevel()
+	{
+		_volumeControl.GetMasterVolumeLevelScalar(out var level);
+		return VolumeHelpers.GetVolumePercentage(level);
+	}
+}

src/FocusVolumeControl/AudioSessions/VolumeHelpers.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FocusVolumeControl.AudioSessions
+{
+	internal class VolumeHelpers
+	{
+		public static float GetAdjustedVolume(float startingVolume, int step, int ticks)
+		{
+			if(step <= 0)
+			{
+				step = 1;
+			}
+
+			var level = startingVolume;
+
+			level += 0.01f * step * ticks;
+			level = Math.Max(level, 0);
+			level = Math.Min(level, 1);
+
+			return level;
+		}
+
+		public static int GetVolumePercentage(float volume) => (int)Math.Round(volume * 100);
+
+	}
+}

src/FocusVolumeControl/DialAction.cs

@@ -1,180 +1,192 @@
 using BarRaider.SdTools;
 using BarRaider.SdTools.Payloads;
-using CoreAudio;
+using FocusVolumeControl.AudioHelpers;
+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
 {
-
-	/*
-    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
 	{
-		private class PluginSettings
+		[JsonProperty("fallbackBehavior")]
+		public FallbackBehavior FallbackBehavior { get; set; }
+
+		[JsonProperty("stepSize")]
+		public int StepSize { get; set; }
+
+		public static PluginSettings CreateDefaultSettings()
 		{
-			public static PluginSettings CreateDefaultSettings()
-			{
-				PluginSettings instance = new PluginSettings();
-				return instance;
-			}
+			PluginSettings instance = new PluginSettings();
+			instance.FallbackBehavior = FallbackBehavior.SystemSounds;
+			instance.StepSize = 1;
+			return instance;
+		}
+	}
+
+	PluginSettings settings;
+	static AudioHelper _audioHelper = new AudioHelper();
+	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;
+		WindowChangedEventLoop.Instance.WindowChanged += WindowChanged;
 
-		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)
+		try
 		{
-			if (payload.Settings == null || payload.Settings.Count == 0)
-			{
-				settings = PluginSettings.CreateDefaultSettings();
-				SaveSettings();
-			}
-			else
-			{
-				settings = payload.Settings.ToObject<PluginSettings>();
-			}
-
-			_thread = new Thread(() =>
-			{
-				Logger.Instance.LogMessage(TracingLevel.DEBUG, "Registering for events");
-				_delegate = new Native.WinEventDelegate(WinEventProc);
-				_foregroundWindowChangedEvent = Native.RegisterForForegroundWindowChangedEvent(_delegate);
-
-				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();
-
+			//just in case we fail to get the active session, don't prevent the plugin from launching
+			var session = _audioHelper.GetActiveSession(settings.FallbackBehavior);
+			_ = UpdateStateIfNeeded(session);
 		}
+		catch { }
+	}
 
-		public override async void DialDown(DialPayload payload)
+	public override void Dispose()
+	{
+		//Logger.Instance.LogMessage(TracingLevel.DEBUG, "Disposing");
+		WindowChangedEventLoop.Instance.WindowChanged -= WindowChanged;
+	}
+
+	public override async void DialDown(DialPayload payload)
+	{
+		try
 		{
-			//dial pressed down
-			Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Down");
+			//Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Down");
 			await ToggleMuteAsync();
 		}
-
-		public override async void TouchPress(TouchpadPressPayload payload)
+		catch (Exception ex)
 		{
-			Logger.Instance.LogMessage(TracingLevel.INFO, "Touch Press");
+			Logger.Instance.LogMessage(TracingLevel.ERROR, $"Unexpected Error in DialDown:\n {ex}");
+		}
+	}
+	public override void DialUp(DialPayload payload) { }
+
+	public override async void TouchPress(TouchpadPressPayload payload)
+	{
+		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
+				await ResetAllAsync();
 			}
 			else
 			{
 				await ToggleMuteAsync();
 			}
 		}
-
-		async Task ToggleMuteAsync()
+		catch (Exception ex)
 		{
-			if (_currentAudioSession != null)
-			{
-				_currentAudioSession.ToggleMute();
-				await UpdateStateIfNeeded();
-			}
-			else
-			{
-				await Connection.ShowAlert();
-			}
+			Logger.Instance.LogMessage(TracingLevel.ERROR, $"Unexpected Error in TouchPress:\n {ex}");
 		}
+	}
 
-		public override async void DialRotate(DialRotatePayload payload)
+	public override async void DialRotate(DialRotatePayload payload)
+	{
+		try
 		{
-			Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Rotate");
+			//Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Rotate");
 			//dial rotated. ticks positive for right, negative for left
-			if (_currentAudioSession != null)
+			var activeSession = _audioHelper.Current;
+			if (activeSession != null)
 			{
-				_currentAudioSession.IncrementVolumeLevel(1, payload.Ticks);
-				await UpdateStateIfNeeded();
+				activeSession.IncrementVolumeLevel(settings.StepSize, payload.Ticks);
+				await UpdateStateIfNeeded(activeSession);
 			}
 			else
 			{
 				await Connection.ShowAlert();
 			}
 		}
-
-		public override void DialUp(DialPayload payload)
+		catch (Exception ex)
 		{
-			//dial unpressed
-			Logger.Instance.LogMessage(TracingLevel.INFO, "Dial Up");
+			_audioHelper.ResetCache();
+			await Connection.ShowAlert();
+			Logger.Instance.LogMessage(TracingLevel.ERROR, $"Unable to increment volume:\n {ex}");
 		}
+	}
 
-		public override void Dispose()
+	async Task ResetAllAsync()
+	{
+		try
 		{
-			Logger.Instance.LogMessage(TracingLevel.DEBUG, "Disposing");
-            if(_foregroundWindowChangedEvent != IntPtr.Zero)
-            {
-                Native.UnhookWinEvent(_foregroundWindowChangedEvent);
-            }
-			_dispatcher.InvokeShutdown();
+			_audioHelper.ResetAll();
 		}
-
-		public override async void OnTick()
+		catch
 		{
-			//called once every 1000ms and can be used for updating the title/image fo the key
-			var activeSession = _audioHelper.GetActiveSession();
+			_audioHelper.ResetCache();
+			await Connection.ShowAlert();
+			throw;
+		}
+	}
 
-			if (activeSession == null)
+	async Task ToggleMuteAsync()
+	{
+		try
+		{
+			var activeSession = _audioHelper.Current;
+			if (activeSession != null)
 			{
-				//todo: something?
+				activeSession.ToggleMute();
+				await UpdateStateIfNeeded(activeSession);
 			}
 			else
 			{
-				_currentAudioSession = activeSession;
+				await Connection.ShowAlert();
 			}
-
-			await UpdateStateIfNeeded();
 		}
-
-		private async Task UpdateStateIfNeeded()
+		catch
 		{
-			if (_currentAudioSession != null)
+			_audioHelper.ResetCache();
+			await Connection.ShowAlert();
+			throw;
+		}
+	}
+
+	public override async void OnTick()
+	{
+		try
+		{
+			//called once every 1000ms and can be used for updating the title/image of the key
+			var activeSession = _audioHelper.GetActiveSession(settings.FallbackBehavior);
+
+			await UpdateStateIfNeeded(activeSession);
+		}
+		catch (Exception ex)
+		{
+			_audioHelper.ResetCache();
+			Logger.Instance.LogMessage(TracingLevel.ERROR, $"Exception on Tick:\n {ex}");
+		}
+	}
+
+	private async Task UpdateStateIfNeeded(IAudioSession audioSession)
+	{
+		try
+		{
+			if (audioSession != null)
 			{
 
-				var uiState = UIState.Build(_currentAudioSession);
+				var uiState = new UIState(audioSession);
 
-				if ( _previousState != null && uiState != null &&
+				if (_previousState != null && uiState != null &&
 					uiState.Title == _previousState.Title &&
 					uiState.Value.Value == _previousState.Value.Value &&
 					uiState.Value.Opacity == _previousState.Value.Opacity &&
@@ -191,31 +203,53 @@ namespace FocusVolumeControl
 				_previousState = uiState;
 			}
 		}
-
-
-		public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload)
+		catch (Exception ex)
 		{
+			Logger.Instance.LogMessage(TracingLevel.ERROR, $"Failed to update screen\n {ex}");
 		}
-
-
-		public override void ReceivedSettings(ReceivedSettingsPayload payload)
-		{
-			Tools.AutoPopulateSettings(settings, payload.Settings);
-			SaveSettings();
-		}
-
-		private Task SaveSettings()
-		{
-			return Connection.SetSettingsAsync(JObject.FromObject(settings));
-		}
-
-
-        public void WinEventProc(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
-        {
-			OnTick();
-        }
-
-
 	}
 
+
+	public override void ReceivedGlobalSettings(ReceivedGlobalSettingsPayload payload)
+	{
+	}
+
+
+	public override void ReceivedSettings(ReceivedSettingsPayload payload)
+	{
+		try
+		{
+			Tools.AutoPopulateSettings(settings, payload.Settings);
+			_ = SaveSettings();
+		}
+		catch (Exception ex)
+		{
+			Logger.Instance.LogMessage(TracingLevel.ERROR, $"Unexpected Error in SaveSettings:\n {ex}");
+		}
+	}
+
+	private async Task SaveSettings()
+	{
+		try
+		{
+			await Connection.SetSettingsAsync(JObject.FromObject(settings));
+		}
+		catch (Exception ex)
+		{
+			Logger.Instance.LogMessage(TracingLevel.ERROR, $"Unexpected Error in SaveSettings:\n {ex}");
+		}
+	}
+
+
+	public void WindowChanged()
+	{
+		try
+		{
+			OnTick();
+		}
+		catch (Exception ex)
+		{
+			Logger.Instance.LogMessage(TracingLevel.ERROR, $"Unexpected Error in Window Down:\n {ex}");
+		}
+	}
 }

src/FocusVolumeControl/FallbackBehavior.cs

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

src/FocusVolumeControl/FocusVolumeControl.csproj

@@ -54,17 +54,28 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ActiveAudioSessionWrapper.cs" />
-    <Compile Include="AudioHelper.cs" />
+    <Compile Include="AudioHelpers\AppxPackage.cs" />
+    <Compile Include="AudioSessions\IconWrapper.cs" />
+    <Compile Include="AudioSessions\ActiveAudioSessionWrapper.cs" />
+    <Compile Include="AudioHelpers\AudioHelper.cs" />
+    <Compile Include="AudioSessions\CoreAudio.cs" />
+    <Compile Include="AudioSessions\VolumeHelpers.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="AudioHelpers\NameAndIconHelper.cs" />
+    <Compile Include="UI\IconExtraction.cs" />
+    <Compile Include="UI\ISDConnectionExtensions.cs" />
     <Compile Include="Native.cs" />
-    <Compile Include="ParentProcessUtilities.cs" />
-    <Compile Include="PluginAction.cs" />
+    <Compile Include="AudioHelpers\ParentProcessUtilities.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="UI\JavaIconExtractor.cs" />
     <Compile Include="UI\UIState.cs" />
     <Compile Include="UI\ValueWithOpacity.cs" />
+    <Compile Include="WindowChangedEventLoop.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -74,46 +85,22 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Images\categoryIcon%402x.png">
+    <Content Include="$(SolutionDir)..\previews\**\*.png" 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">
+    <Content Include="PropertyInspector\**\*.js;PropertyInspector\**\*.css">
       <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">
-      <Version>1.27.0</Version>
+    <PackageReference Include="BitFaster.Caching">
+      <Version>2.2.1</Version>
     </PackageReference>
     <PackageReference Include="IsExternalInit">
       <Version>1.0.3</Version>
@@ -139,8 +126,4 @@
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <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,75 @@
-using System;
+using FocusVolumeControl.AudioHelpers;
+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")]
-		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)
+		if(windowHandle != IntPtr.Zero)
 		{
-			var ids = new List<int>();
 
-			if(windowHandle != IntPtr.Zero)
-			{
+		EnumChildWindows(windowHandle,
+				(hWnd, lParam) => 
+				{
+					Native.GetWindowThreadProcessId(hWnd, out var pid);
+					ids.Add(pid);
 
-			EnumChildWindows(windowHandle,
-					(hWnd, lParam) => 
-					{
-						Native.GetWindowThreadProcessId(hWnd, out var pid);
-						ids.Add(pid);
+				return true;
 
-					return true;
-
-				}, IntPtr.Zero);
-			}
-
-			return ids;
+			}, IntPtr.Zero);
 		}
 
-
+		return ids;
 	}
+
+	[DllImport("ntdll.dll")]
+	public static extern int NtQueryInformationProcess(IntPtr processHandle, int processInformationClass, ref ParentProcessUtilities processInformation, int processInformationLength, out int returnLength);
+
+
+	[DllImport("Kernel32.dll")]
+	public static extern bool QueryFullProcessImageName(IntPtr hProcess, uint flags, StringBuilder buffer, ref uint bufferSize);
+
+	[DllImport("kernel32.dll")]
+	public static extern IntPtr OpenProcess(uint processAccess, bool inheritHandle, int processId);
+
+	[DllImport("kernel32.dll")]
+	public static extern bool CloseHandle(IntPtr hObject);
+
+
 }

src/FocusVolumeControl/ParentProcessUtilities.cs

@@ -1,65 +0,0 @@
-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
-{
-	/// <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)
-		{
-			var process = Process.GetProcessById(id);
-			return GetParentProcess(process);
-		}
-
-		/// <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(Process process)
-		{
-			var data = new ParentProcessUtilities();
-			int status = NtQueryInformationProcess(process.Handle, 0, ref data, Marshal.SizeOf(data), out var returnLength);
-			if (status != 0)
-			{
-				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,16 @@
 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); }
+#if DEBUG
+		// Uncomment this line of code to allow for debugging
+		//while (!System.Diagnostics.Debugger.IsAttached) { System.Threading.Thread.Sleep(100); }
+#endif
 
-			SDWrapper.Run(args);
-		}
+		SDWrapper.Run(args);
 	}
 }

src/FocusVolumeControl/PropertyInspector/PluginActionPI.html

@@ -6,12 +6,41 @@
     <meta name=apple-mobile-web-app-capable content=yes>
     <meta name=apple-mobile-web-app-status-bar-style content=black>
     <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>
+    <link rel="stylesheet" href="./lib/sdpi.css">
+    <link rel="sytlesheet" href="./lib/rangeTooltip.css">
+    <script src="lib/sdtools.common.js"></script>
+    <script src="lib/rangeTooltip.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">Default Output Device Volume</option>
+            </select>
+        </div>
+
+
+        <div type="range" class="sdpi-item sdShowTooltip">
+            <div class="sdpi-item-label">Step Size</div>
+            <div class="sdpi-item-value">
+                <span class="clickable" value="1">1</span>
+                <input type="range" min="1" max="10" value="1" class="sdProperty" data-suffix=" %" id="stepSize" oninput="setSettings()" />
+                <span class="clickable" value="1">10</span>
+            </div>
+        </div>
+        <div class="sdpi-info-label hidden" style="top: -1000;" value="">Tooltip</div>
+
+        <details>
+            <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>* Default Output Device Volume - Switch to the main volume control for the default output device. This will change the volume of the default output device. This is usually volume for all applications, unless you override the output device for specific applications.</p>
+        </details>
+
     </div>
 </body>
 </html>

src/FocusVolumeControl/PropertyInspector/PluginActionPI.js

@@ -1 +0,0 @@
-

src/FocusVolumeControl/PropertyInspector/lib/rangeTooltip.css

@@ -0,0 +1,41 @@
+.sdpi-info-label {
+    display: inline-block;
+    user-select: none;
+    position: absolute;
+    height: 15px;
+    width: auto;
+    text-align: center;
+    border-radius: 4px;
+    min-width: 44px;
+    max-width: 80px;
+    background: white;
+    font-size: 11px;
+    color: black;
+    z-index: 1000;
+    box-shadow: 0px 0px 12px rgba(0,0,0,.8);
+    padding: 2px;
+}
+
+    .sdpi-info-label.hidden {
+        opacity: 0;
+        transition: opacity 0.25s linear;
+    }
+
+    .sdpi-info-label.shown {
+        position: absolute;
+        opacity: 1;
+        transition: opacity 0.25s ease-out;
+    }
+
+.rangeLabel {
+    position: relative;
+    font-weight: normal;
+    margin-top: 22px;
+    left: -200px;
+    min-width: 200px;
+    text-align: center;
+}
+
+.percent::after {
+    content: "%";
+}

src/FocusVolumeControl/PropertyInspector/lib/rangeTooltip.js

@@ -0,0 +1,122 @@
+// ****************************************************************
+// * EasyPI v1.3
+// * Author: BarRaider
+// *
+// * rangeTooltip.js adds a tooltip showing the value of a range slider.
+// * Requires rangeTooltip.css to be referenced in the HTML file.
+// *
+// * Project page: https://github.com/BarRaider/streamdeck-easypi
+// * Support: http://discord.barraider.com
+// ****************************************************************
+
+var tooltip = document.querySelector('.sdpi-info-label');
+var tw;
+
+document.addEventListener("DOMContentLoaded", function () {
+    // Handler when the DOM is fully loaded
+    setRangeTooltips();
+});
+
+function calcRangeLabel(elem) {
+    const value = elem.value;
+    const percent = (elem.value - elem.min) / (elem.max - elem.min);
+    let tooltipValue = value;
+    let outputType = elem.dataset.suffix;
+    if (outputType && outputType == '%') {
+        tooltipValue = Math.round(100 * percent);
+    }
+
+    return tooltipValue + outputType;
+}
+
+function setElementLabel(elem, str) {
+    // Try to set this for the rangeLabel class, if it exists
+    let label = elem.querySelector('.rangeLabel');
+    if (label) {
+        label.innerHTML = str;
+    }
+    else {
+        console.log('setElementLabel ERROR! No .rangeLabel found', elem);
+    }
+}
+
+function setRangeTooltips() {
+    console.log("Loading setRangeTooltips");
+
+    if (!tooltip) {
+        tooltip = document.querySelector('.sdpi-info-label');
+    }
+
+    if (!tw) {
+        tw = tooltip.getBoundingClientRect().width;
+    }
+
+    const rangeToolTips = document.querySelectorAll('div[type=range].sdShowTooltip');
+    rangeToolTips.forEach(elem => {
+        let rangeSelector = elem.querySelector('input[type=range]');
+        let fn = () => {
+            const rangeRect = rangeSelector.getBoundingClientRect();
+            const w = rangeRect.width - tw / 2;
+            const labelStr = calcRangeLabel(rangeSelector);
+            // Set the tooltip
+            if (tooltip.classList.contains('hidden')) {
+                tooltip.style.top = '-1000px';
+            } else {
+                const percent = (rangeSelector.value - rangeSelector.min) / (rangeSelector.max - rangeSelector.min);
+                tooltip.style.left = (rangeRect.left + Math.round(w * percent) - tw / 4) + 'px';
+                tooltip.textContent = labelStr;
+                tooltip.style.top = (rangeRect.top - 32) + 'px';
+            }
+
+            setElementLabel(elem, labelStr)
+        };
+
+        rangeSelector.addEventListener(
+            'mouseenter',
+            function () {
+                tooltip.classList.remove('hidden');
+                tooltip.classList.add('shown');
+                fn();
+            },
+            false
+        );
+
+        rangeSelector.addEventListener(
+            'mouseout',
+            function () {
+                tooltip.classList.remove('shown');
+                tooltip.classList.add('hidden');
+                fn();
+            },
+            false
+        );
+        rangeSelector.addEventListener('input', fn, false);
+
+        rangeSelector.addEventListener("change", fn, false);
+
+        document.addEventListener(
+            'settingsUpdated',
+            function () {
+                console.log('rangeTooltip settingsUpdated called');
+                window.setTimeout(function () {
+                    let str = calcRangeLabel(rangeSelector);
+                    setElementLabel(elem, str);
+                }, 500);
+            },
+            false
+        );
+
+        document.addEventListener(
+            'websocketCreate',
+            function () {
+                console.log('rangeTooltip websocketCreate called');
+                window.setTimeout(function () {
+                    let str = calcRangeLabel(rangeSelector);
+                    setElementLabel(elem, str);
+                }, 500);
+            },
+            false
+        );
+    });
+
+}

src/FocusVolumeControl/PropertyInspector/lib/sdtools.common.js

@@ -0,0 +1,321 @@
+// ****************************************************************
+// * EasyPI v1.4
+// * Author: BarRaider
+// *
+// * JS library to simplify the communication between the 
+// * Stream Deck's Property Inspector and the plugin.
+// *
+// * Project page: https://github.com/BarRaider/streamdeck-easypi
+// * Support: http://discord.barraider.com
+// *
+// * Initially forked from Elgato's common.js file
+// ****************************************************************
+
+var websocket = null,
+    uuid = null,
+    registerEventName = null,
+    actionInfo = {},
+    inInfo = {},
+    runningApps = [],
+    isQT = navigator.appVersion.includes('QtWebEngine');
+
+function connectElgatoStreamDeckSocket(inPort, inUUID, inRegisterEvent, inInfo, inActionInfo) {
+    uuid = inUUID;
+    registerEventName = inRegisterEvent;
+    console.log(inUUID, inActionInfo);
+    actionInfo = JSON.parse(inActionInfo); // cache the info
+    inInfo = JSON.parse(inInfo);
+    websocket = new WebSocket('ws://127.0.0.1:' + inPort);
+
+    addDynamicStyles(inInfo.colors);
+
+    websocket.onopen = websocketOnOpen;
+    websocket.onmessage = websocketOnMessage;
+
+    // Allow others to get notified that the websocket is created
+    var event = new Event('websocketCreate');
+    document.dispatchEvent(event);
+
+    loadConfiguration(actionInfo.payload.settings);
+    initPropertyInspector();
+}
+
+function websocketOnOpen() {
+    var json = {
+        event: registerEventName,
+        uuid: uuid
+    };
+    websocket.send(JSON.stringify(json));
+
+    // Notify the plugin that we are connected
+    sendValueToPlugin('propertyInspectorConnected', 'property_inspector');
+}
+
+function websocketOnMessage(evt) {
+    // Received message from Stream Deck
+    var jsonObj = JSON.parse(evt.data);
+
+    if (jsonObj.event === 'didReceiveSettings') {
+        var payload = jsonObj.payload;
+        loadConfiguration(payload.settings);
+    }
+    else {
+        console.log("Ignored websocketOnMessage: " + jsonObj.event);
+    }
+}
+
+function loadConfiguration(payload) {
+    console.log('loadConfiguration');
+    console.log(payload);
+    for (var key in payload) {
+        try {
+            var elem = document.getElementById(key);
+            if (elem.classList.contains("sdCheckbox")) { // Checkbox
+                elem.checked = payload[key];
+            }
+            else if (elem.classList.contains("sdFile")) { // File
+                var elemFile = document.getElementById(elem.id + "Filename");
+                elemFile.innerText = payload[key];
+                if (!elemFile.innerText) {
+                    elemFile.innerText = "No file...";
+                }
+            }
+            else if (elem.classList.contains("sdList")) { // Dynamic dropdown
+                var textProperty = elem.getAttribute("sdListTextProperty");
+                var valueProperty = elem.getAttribute("sdListValueProperty");
+                var valueField = elem.getAttribute("sdValueField");
+
+                var items = payload[key];
+                elem.options.length = 0;
+
+                for (var idx = 0; idx < items.length; idx++) {
+                    var opt = document.createElement('option');
+                    opt.value = items[idx][valueProperty];
+                    opt.text = items[idx][textProperty];
+                    elem.appendChild(opt);
+                }
+                elem.value = payload[valueField];
+            }
+            else if (elem.classList.contains("sdHTML")) { // HTML element
+                elem.innerHTML = payload[key];
+            }
+            else { // Normal value
+                elem.value = payload[key];
+            }
+            console.log("Load: " + key + "=" + payload[key]);
+        }
+        catch (err) {
+            console.log("loadConfiguration failed for key: " + key + " - " + err);
+        }
+    }
+}
+
+function setSettings() {
+    var payload = {};
+    var elements = document.getElementsByClassName("sdProperty");
+
+    Array.prototype.forEach.call(elements, function (elem) {
+        var key = elem.id;
+        if (elem.classList.contains("sdCheckbox")) { // Checkbox
+            payload[key] = elem.checked;
+        }
+        else if (elem.classList.contains("sdFile")) { // File
+            var elemFile = document.getElementById(elem.id + "Filename");
+            payload[key] = elem.value;
+            if (!elem.value) {
+                // Fetch innerText if file is empty (happens when we lose and regain focus to this key)
+                payload[key] = elemFile.innerText;
+            }
+            else {
+                // Set value on initial file selection
+                elemFile.innerText = elem.value;
+            }
+        }
+        else if (elem.classList.contains("sdList")) { // Dynamic dropdown
+            var valueField = elem.getAttribute("sdValueField");
+            payload[valueField] = elem.value;
+        }
+        else if (elem.classList.contains("sdHTML")) { // HTML element
+            var valueField = elem.getAttribute("sdValueField");
+            payload[valueField] = elem.innerHTML;
+        }
+        else { // Normal value
+            payload[key] = elem.value;
+        }
+        console.log("Save: " + key + "<=" + payload[key]);
+    });
+    setSettingsToPlugin(payload);
+}
+
+function setSettingsToPlugin(payload) {
+    if (websocket && (websocket.readyState === 1)) {
+        const json = {
+            'event': 'setSettings',
+            'context': uuid,
+            'payload': payload
+        };
+        websocket.send(JSON.stringify(json));
+        var event = new Event('settingsUpdated');
+        document.dispatchEvent(event);
+    }
+}
+
+// Sends an entire payload to the sendToPlugin method
+function sendPayloadToPlugin(payload) {
+    if (websocket && (websocket.readyState === 1)) {
+        const json = {
+            'action': actionInfo['action'],
+            'event': 'sendToPlugin',
+            'context': uuid,
+            'payload': payload
+        };
+        websocket.send(JSON.stringify(json));
+    }
+}
+
+// Sends one value to the sendToPlugin method
+function sendValueToPlugin(value, param) {
+    if (websocket && (websocket.readyState === 1)) {
+        const json = {
+            'action': actionInfo['action'],
+            'event': 'sendToPlugin',
+            'context': uuid,
+            'payload': {
+                [param]: value
+            }
+        };
+        websocket.send(JSON.stringify(json));
+    }
+}
+
+function openWebsite() {
+    if (websocket && (websocket.readyState === 1)) {
+        const json = {
+            'event': 'openUrl',
+            'payload': {
+                'url': 'https://BarRaider.com'
+            }
+        };
+        websocket.send(JSON.stringify(json));
+    }
+}
+
+if (!isQT) {
+    document.addEventListener('DOMContentLoaded', function () {
+        initPropertyInspector();
+    });
+}
+
+window.addEventListener('beforeunload', function (e) {
+    e.preventDefault();
+
+    // Notify the plugin we are about to leave
+    sendValueToPlugin('propertyInspectorWillDisappear', 'property_inspector');
+
+    // Don't set a returnValue to the event, otherwise Chromium with throw an error.
+});
+
+function prepareDOMElements(baseElement) {
+    baseElement = baseElement || document;
+
+    /**
+     * You could add a 'label' to a textares, e.g. to show the number of charactes already typed
+     * or contained in the textarea. This helper updates this label for you.
+     */
+    baseElement.querySelectorAll('textarea').forEach((e) => {
+        const maxl = e.getAttribute('maxlength');
+        e.targets = baseElement.querySelectorAll(`[for='${e.id}']`);
+        if (e.targets.length) {
+            let fn = () => {
+                for (let x of e.targets) {
+                    x.textContent = maxl ? `${e.value.length}/${maxl}` : `${e.value.length}`;
+                }
+            };
+            fn();
+            e.onkeyup = fn;
+        }
+    });
+}
+
+function initPropertyInspector() {
+    // Place to add functions
+    prepareDOMElements(document);
+}
+
+
+function addDynamicStyles(clrs) {
+    const node = document.getElementById('#sdpi-dynamic-styles') || document.createElement('style');
+    if (!clrs.mouseDownColor) clrs.mouseDownColor = fadeColor(clrs.highlightColor, -100);
+    const clr = clrs.highlightColor.slice(0, 7);
+    const clr1 = fadeColor(clr, 100);
+    const clr2 = fadeColor(clr, 60);
+    const metersActiveColor = fadeColor(clr, -60);
+
+    node.setAttribute('id', 'sdpi-dynamic-styles');
+    node.innerHTML = `
+
+    input[type="radio"]:checked + label span,
+    input[type="checkbox"]:checked + label span {
+        background-color: ${clrs.highlightColor};
+    }
+
+    input[type="radio"]:active:checked + label span,
+    input[type="radio"]:active + label span,
+    input[type="checkbox"]:active:checked + label span,
+    input[type="checkbox"]:active + label span {
+      background-color: ${clrs.mouseDownColor};
+    }
+
+    input[type="radio"]:active + label span,
+    input[type="checkbox"]:active + label span {
+      background-color: ${clrs.buttonPressedBorderColor};
+    }
+
+    td.selected,
+    td.selected:hover,
+    li.selected:hover,
+    li.selected {
+      color: white;
+      background-color: ${clrs.highlightColor};
+    }
+
+    .sdpi-file-label > label:active,
+    .sdpi-file-label.file:active,
+    label.sdpi-file-label:active,
+    label.sdpi-file-info:active,
+    input[type="file"]::-webkit-file-upload-button:active,
+    button:active {
+      background-color: ${clrs.buttonPressedBackgroundColor};
+      color: ${clrs.buttonPressedTextColor};
+      border-color: ${clrs.buttonPressedBorderColor};
+    }
+
+    ::-webkit-progress-value,
+    meter::-webkit-meter-optimum-value {
+        background: linear-gradient(${clr2}, ${clr1} 20%, ${clr} 45%, ${clr} 55%, ${clr2})
+    }
+
+    ::-webkit-progress-value:active,
+    meter::-webkit-meter-optimum-value:active {
+        background: linear-gradient(${clr}, ${clr2} 20%, ${metersActiveColor} 45%, ${metersActiveColor} 55%, ${clr})
+    }
+    `;
+    document.body.appendChild(node);
+};
+
+/** UTILITIES */
+
+/*
+    Quick utility to lighten or darken a color (doesn't take color-drifting, etc. into account)
+    Usage:
+    fadeColor('#061261', 100); // will lighten the color
+    fadeColor('#200867'), -100); // will darken the color
+*/
+function fadeColor(col, amt) {
+    const min = Math.min, max = Math.max;
+    const num = parseInt(col.replace(/#/g, ''), 16);
+    const r = min(255, max((num >> 16) + amt, 0));
+    const g = min(255, max((num & 0x0000FF) + amt, 0));
+    const b = min(255, max(((num >> 8) & 0x00FF) + amt, 0));
+    return '#' + (g | (b << 8) | (r << 16)).toString(16).padStart(6, 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/IconExtraction.cs

@@ -0,0 +1,267 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace FocusVolumeControl.UI
+{
+	internal class IconExtraction
+	{
+		public static Bitmap GetIcon(string path)
+		{
+			var index = GetIconIndex(path);
+			var handle = GetIconHandle(index);
+
+			using var icon = (Icon)Icon.FromHandle(handle).Clone();
+
+			Shell32.DestroyIcon(handle);
+			return icon.ToBitmap();
+		}
+
+
+		static int GetIconIndex(string pszFile)
+		{
+			SHFILEINFO sfi = new SHFILEINFO();
+			Shell32.SHGetFileInfo(pszFile, 0, ref sfi, (uint)Marshal.SizeOf(sfi), (uint)(SHGFI.SysIconIndex | SHGFI.LargeIcon | SHGFI.UseFileAttributes));
+			return sfi.iIcon;
+		}
+
+		// 256*256
+		static IntPtr GetIconHandle(int iImage)
+		{
+			IImageList spiml = null;
+			Guid guil = new Guid(IID_IImageList2);//or IID_IImageList
+
+			Shell32.SHGetImageList(Shell32.SHIL_EXTRALARGE, ref guil, ref spiml);
+			IntPtr hIcon = IntPtr.Zero;
+			spiml.GetIcon(iImage, Shell32.ILD_TRANSPARENT | Shell32.ILD_IMAGE, ref hIcon);
+
+			return hIcon;
+		}
+
+		const string IID_IImageList = "46EB5926-582E-4017-9FDF-E8998DAA0950";
+		const string IID_IImageList2 = "192B9D83-50FC-457B-90A0-2B82A8B5DAE1";
+
+		public static class Shell32
+		{
+
+			public const int SHIL_LARGE = 0x0;
+			public const int SHIL_SMALL = 0x1;
+			public const int SHIL_EXTRALARGE = 0x2;
+			public const int SHIL_SYSSMALL = 0x3;
+			public const int SHIL_JUMBO = 0x4;
+			public const int SHIL_LAST = 0x4;
+
+			public const int ILD_TRANSPARENT = 0x00000001;
+			public const int ILD_IMAGE = 0x00000020;
+
+			[DllImport("shell32.dll", EntryPoint = "#727")]
+			public extern static int SHGetImageList(int iImageList, ref Guid riid, ref IImageList ppv);
+
+			[DllImport("user32.dll", EntryPoint = "DestroyIcon", SetLastError = true)]
+			public static extern int DestroyIcon(IntPtr hIcon);
+
+			//[DllImport("shell32.dll")]
+			//public static extern uint SHGetIDListFromObject([MarshalAs(UnmanagedType.IUnknown)] object iUnknown, out IntPtr ppidl);
+
+			[DllImport("Shell32.dll")]
+			public static extern IntPtr SHGetFileInfo(string pszPath, uint dwFileAttributes, ref SHFILEINFO psfi, uint cbFileInfo, uint uFlags);
+		}
+
+		[Flags]
+		enum SHGFI : uint
+		{
+			/// <summary>get icon</summary>
+			Icon = 0x000000100,
+			/// <summary>get display name</summary>
+			DisplayName = 0x000000200,
+			/// <summary>get type name</summary>
+			TypeName = 0x000000400,
+			/// <summary>get attributes</summary>
+			Attributes = 0x000000800,
+			/// <summary>get icon location</summary>
+			IconLocation = 0x000001000,
+			/// <summary>return exe type</summary>
+			ExeType = 0x000002000,
+			/// <summary>get system icon index</summary>
+			SysIconIndex = 0x000004000,
+			/// <summary>put a link overlay on icon</summary>
+			LinkOverlay = 0x000008000,
+			/// <summary>show icon in selected state</summary>
+			Selected = 0x000010000,
+			/// <summary>get only specified attributes</summary>
+			Attr_Specified = 0x000020000,
+			/// <summary>get large icon</summary>
+			LargeIcon = 0x000000000,
+			/// <summary>get small icon</summary>
+			SmallIcon = 0x000000001,
+			/// <summary>get open icon</summary>
+			OpenIcon = 0x000000002,
+			/// <summary>get shell size icon</summary>
+			ShellIconSize = 0x000000004,
+			/// <summary>pszPath is a pidl</summary>
+			PIDL = 0x000000008,
+			/// <summary>use passed dwFileAttribute</summary>
+			UseFileAttributes = 0x000000010,
+			/// <summary>apply the appropriate overlays</summary>
+			AddOverlays = 0x000000020,
+			/// <summary>Get the index of the overlay in the upper 8 bits of the iIcon</summary>
+			OverlayIndex = 0x000000040,
+		}
+
+		[StructLayout(LayoutKind.Sequential)]
+		public struct SHFILEINFO
+		{
+			public const int NAMESIZE = 80;
+			public IntPtr hIcon;
+			public int iIcon;
+			public uint dwAttributes;
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
+			public string szDisplayName;
+			[MarshalAs(UnmanagedType.ByValTStr, SizeConst = 80)]
+			public string szTypeName;
+		};
+
+
+		[StructLayout(LayoutKind.Sequential)]
+		public struct RECT
+		{
+			public int left, top, right, bottom;
+		}
+
+		[StructLayout(LayoutKind.Sequential)]
+		public struct POINT
+		{
+			int x;
+			int y;
+		}
+
+		[StructLayout(LayoutKind.Sequential)]
+		public struct IMAGELISTDRAWPARAMS
+		{
+			public int cbSize;
+			public IntPtr himl;
+			public int i;
+			public IntPtr hdcDst;
+			public int x;
+			public int y;
+			public int cx;
+			public int cy;
+			public int xBitmap;    // x offest from the upperleft of bitmap
+			public int yBitmap;    // y offset from the upperleft of bitmap
+			public int rgbBk;
+			public int rgbFg;
+			public int fStyle;
+			public int dwRop;
+			public int fState;
+			public int Frame;
+			public int crEffect;
+		}
+
+		[StructLayout(LayoutKind.Sequential)]
+		public struct IMAGEINFO
+		{
+			public IntPtr hbmImage;
+			public IntPtr hbmMask;
+			public int Unused1;
+			public int Unused2;
+			public RECT rcImage;
+		}
+		[ComImportAttribute()]
+		[GuidAttribute("46EB5926-582E-4017-9FDF-E8998DAA0950")]
+		[InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown)]
+		public interface IImageList
+		{
+			[PreserveSig]
+			int Add(IntPtr hbmImage, IntPtr hbmMask, ref int pi);
+
+			[PreserveSig]
+			int ReplaceIcon(int i, IntPtr hicon, ref int pi);
+
+			[PreserveSig]
+			int SetOverlayImage(int iImage, int iOverlay);
+
+			[PreserveSig]
+			int Replace(int i, IntPtr hbmImage, IntPtr hbmMask);
+
+			[PreserveSig]
+			int AddMasked(IntPtr hbmImage, int crMask, ref int pi);
+
+			[PreserveSig]
+			int Draw(ref IMAGELISTDRAWPARAMS pimldp);
+
+			[PreserveSig]
+			int Remove(int i);
+
+			[PreserveSig]
+			int GetIcon(int i, int flags, ref IntPtr picon);
+
+			[PreserveSig]
+			int GetImageInfo(int i, ref IMAGEINFO pImageInfo);
+
+			[PreserveSig]
+			int Copy(int iDst, IImageList punkSrc, int iSrc, int uFlags);
+
+			[PreserveSig]
+			int Merge(int i1, IImageList punk2, int i2, int dx, int dy, ref Guid riid, ref IntPtr ppv);
+
+			[PreserveSig]
+			int Clone(ref Guid riid, ref IntPtr ppv);
+
+			[PreserveSig]
+			int GetImageRect(int i, ref RECT prc);
+
+			[PreserveSig]
+			int GetIconSize(ref int cx, ref int cy);
+
+			[PreserveSig]
+			int SetIconSize(int cx, int cy);
+
+			[PreserveSig]
+			int GetImageCount(ref int pi);
+
+			[PreserveSig]
+			int SetImageCount(int uNewCount);
+
+			[PreserveSig]
+			int SetBkColor(int clrBk, ref int pclr);
+
+			[PreserveSig]
+			int GetBkColor(ref int pclr);
+
+			[PreserveSig]
+			int BeginDrag(int iTrack, int dxHotspot, int dyHotspot);
+
+			[PreserveSig]
+			int EndDrag();
+
+			[PreserveSig]
+			int DragEnter(IntPtr hwndLock, int x, int y);
+
+			[PreserveSig]
+			int DragLeave(IntPtr hwndLock);
+
+			[PreserveSig]
+			int DragMove(int x, int y);
+
+			[PreserveSig]
+			int SetDragCursorImage(ref IImageList punk, int iDrag, int dxHotspot, int dyHotspot);
+
+			[PreserveSig]
+			int DragShowNolock(int fShow);
+
+			[PreserveSig]
+			int GetDragImage(ref POINT ppt, ref POINT pptHotspot, ref Guid riid, ref IntPtr ppv);
+
+			[PreserveSig]
+			int GetItemFlags(int i, ref int dwFlags);
+
+			[PreserveSig]
+			int GetOverlayImage(int iOverlay, ref int piIndex);
+		};
+
+	}
+}

src/FocusVolumeControl/UI/JavaIconExtractor.cs

@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace FocusVolumeControl.UI
+{
+	internal class JavaIconExtractor
+	{
+		const int WM_GETICON = 0x7F;
+		const int WM_QUERYDRAGICON = 0x0037;
+		//const int ICON_SMALL = 0; //(16x16)
+		const int ICON_BIG = 1; //(32x32)
+		const int SMTO_ABORTIFHUNG = 0x3;
+		const int GCL_HICON = -14;
+
+		[DllImport("User32.dll")]
+		static extern int SendMessageTimeout(IntPtr hWnd, int uMsg, int wParam, int lParam, int fuFlags, int uTimeout, out int lpdwResult);
+		[DllImport("User32.dll")]
+		static extern int GetClassLong(IntPtr hWnd, int index);
+
+		[DllImport("user32.dll", EntryPoint = "DestroyIcon", SetLastError = true)]
+		public static extern int DestroyIcon(IntPtr hIcon);
+
+		public static Bitmap? GetWindowBigIconWithRetry(IntPtr hWnd)
+		{
+			var retry = 5;
+			var icon = GetWindowBigIcon(hWnd);
+
+			while(icon == null || retry > 0)
+			{
+				Thread.Sleep(100);
+				icon = GetWindowBigIcon(hWnd);
+				retry--;
+			}
+
+			return icon;
+
+		}
+
+		/// <summary>
+		/// Retrieves a big icon (32*32) of a window
+		/// </summary>
+		/// <param name="hWnd"></param>
+		/// <returns></returns>
+		public static Bitmap? GetWindowBigIcon(IntPtr hWnd)
+		{
+			IntPtr hIcon = IntPtr.Zero;
+			try
+			{
+				int result;
+				SendMessageTimeout(hWnd, WM_GETICON, ICON_BIG, //big icon size
+					0, SMTO_ABORTIFHUNG, 1000, out result);
+
+				hIcon = new IntPtr(result);
+				if (hIcon == IntPtr.Zero) //some applications don't respond to sendmessage, we have to use GetClassLong in that case
+				{
+					result = GetClassLong(hWnd, GCL_HICON); //big icon size
+					hIcon = new IntPtr(result);
+				}
+
+				if (hIcon == IntPtr.Zero)
+				{
+					SendMessageTimeout(hWnd, WM_QUERYDRAGICON, 0, 0, SMTO_ABORTIFHUNG, 1000, out result);
+					hIcon = new IntPtr(result);
+				}
+
+				if (hIcon == IntPtr.Zero)
+				{
+					return null;
+				}
+				else
+				{
+					using var tmp = (Icon)Icon.FromHandle(hIcon).Clone();
+					return tmp.ToBitmap();
+				}
+			}
+			catch (Exception)
+			{
+			}
+			finally
+			{
+				if(hIcon != IntPtr.Zero)
+				{
+					DestroyIcon(hIcon);
+				}
+			}
+			return null;
+		}
+
+	}
+}

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")]
-		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 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 },
-			};
-		}
+		var volume = session.GetVolumeLevel();
+		var opacity = session.IsMuted() ? 0.5f : 1;
+		var iconData = session.GetIcon();
 
+		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")]
-		public required float Opacity { get; init; }
+	[JsonProperty("opacity")]
+	public required float Opacity { get; init; }
 
-	}
 }

src/FocusVolumeControl/WindowChangedEventLoop.cs

@@ -0,0 +1,66 @@
+using BarRaider.SdTools;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows.Threading;
+
+namespace FocusVolumeControl
+{
+	internal class WindowChangedEventLoop
+	{
+		private static readonly Lazy<WindowChangedEventLoop> _lazy = new Lazy<WindowChangedEventLoop>(() => new WindowChangedEventLoop());
+		public static WindowChangedEventLoop Instance => _lazy.Value;
+
+		readonly Thread _thread;
+		Dispatcher _dispatcher;
+
+		IntPtr _foregroundWindowChangedEvent;
+		Native.WinEventDelegate _delegate;
+
+		private WindowChangedEventLoop()
+		{
+			_thread = new Thread(() =>
+			{
+				Logger.Instance.LogMessage(TracingLevel.DEBUG, "Starting Window Changed Event Loop");
+				_delegate = new Native.WinEventDelegate(WinEventProc);
+				_foregroundWindowChangedEvent = Native.RegisterForForegroundWindowChangedEvent(_delegate);
+
+				_dispatcher = Dispatcher.CurrentDispatcher;
+				Dispatcher.Run();
+				Logger.Instance.LogMessage(TracingLevel.DEBUG, "Window Changed Event Loop Stopped");
+			});
+			_thread.SetApartmentState(ApartmentState.STA);
+			_thread.Start();
+		}
+
+		public event Action WindowChanged;
+
+		CancellationTokenSource? _cancellationTokenSource = null;
+
+		private async void WinEventProc(IntPtr hWinEventHook, uint eventType, IntPtr hwnd, int idObject, int idChild, uint dwEventThread, uint dwmsEventTime)
+		{
+			try
+			{
+				//debounce the window changed events by 100 ms because if you click mouse over an application on the start bar
+				//and then click on the preview window, it will quickly go from current -> fallback -> new app
+				//which can often result in it getting stuck on the fallback app
+				_cancellationTokenSource?.Cancel();
+				_cancellationTokenSource = new CancellationTokenSource();
+				await Task.Delay(100, _cancellationTokenSource.Token);
+				WindowChanged?.Invoke();
+			}
+			catch (TaskCanceledException)
+			{
+				//ignored
+			}
+			catch (Exception ex)
+			{
+				Logger.Instance.LogMessage(TracingLevel.ERROR, $"Unexpected Error in EventHandler:\n {ex}");
+			}
+		}
+	}
+}

src/FocusVolumeControl/manifest.json

@@ -2,10 +2,10 @@
   "Actions": [
     {
       "Name": "Focused App Volume",
-      "Icon": "Images/icon",
+      "Icon": "Images/actionIcon",
       "States": [
         {
-          "Image": "Images/pluginAction",
+          "Image": "Images/stateIcon",
           "TitleAlignment": "middle",
           "FontSize": "12"
         }
@@ -18,9 +18,9 @@
         "StackColor": "#AABBCC",
         "TriggerDescription": {
           "Rotate": "Change the volume",
-          "Push": "Mute/UnMute",
-          "Touch": "Mute/UnMute",
-          "LongTouch":  "Reset all apps"
+          "Push": "Mute",
+          "Touch": "Mute",
+          "LongTouch": "Reset"
         }
       },
       "SupportedInMultiActions": false,
@@ -30,10 +30,10 @@
     }
   ],
   "Author": "dlprows",
-  "Name": "FocusVolumeControl",
+  "Name": "Focused Application Volume",
   "Description": "Control the volume of the focused application",
-  "URL": "https://encyclopediaofdaniel.com",
-  "Version": "1.0",
+  "URL": "https://github.com/dlprows/FocusVolumeControl",
+  "Version": "1.2.0",
   "CodePath": "FocusVolumeControl",
   "Category": "Volume Control [dlprows]",
   "Icon": "Images/pluginIcon",

src/SoundBrowser/MainWindow.xaml

@@ -6,14 +6,16 @@
         xmlns:local="clr-namespace:SoundBrowser"
         mc:Ignorable="d"
         Title="MainWindow" Height="800" Width="800">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="auto"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
+    <ScrollViewer>
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="auto"/>
+                <RowDefinition Height="*"/>
+            </Grid.RowDefinitions>
 
-        <TextBlock x:Name="_tf" Grid.Row="0">current</TextBlock>
-        <TextBlock x:Name="_tf2" Grid.Row="1">list</TextBlock>
+            <TextBlock x:Name="_tf" Grid.Row="0">current</TextBlock>
+            <TextBlock x:Name="_tf2" Grid.Row="1">list</TextBlock>
 
-    </Grid>
+        </Grid>
+    </ScrollViewer>
 </Window>

src/SoundBrowser/MainWindow.xaml.cs

@@ -1,135 +1,128 @@
-using CoreAudio;
-using FocusVolumeControl;
+using FocusVolumeControl;
+using FocusVolumeControl.AudioHelpers;
+using FocusVolumeControl.AudioSessions;
 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
-	/// </summary>
-	public partial class MainWindow : Window
+
+	AudioHelper _audioHelper;
+	Native.WinEventDelegate _delegate;
+
+	public MainWindow()
 	{
+		InitializeComponent();
+		_audioHelper = new AudioHelper();
 
-		AudioHelper _audioHelper;
-		Native.WinEventDelegate _delegate;
+		//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 MainWindow()
+	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)
 		{
-			InitializeComponent();
-			_audioHelper = new AudioHelper();
+			//use this in debug to help there be less events
 
-			//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);
-		}
+			/*
+			Native.GetWindowThreadProcessId(handle, out var fpid);
+			var fp = Process.GetProcessById(fpid);
 
-		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)
+			if(!fp.ProcessName.Contains("FSD"))
 			{
-				//use this in debug to help there be less events
+				return;
+			}
+			*/
 
-				/*
-				Native.GetWindowThreadProcessId(handle, out var fpid);
-				var fp = Process.GetProcessById(fpid);
+			var processes = _audioHelper.GetPossibleProcesses();
+			var session = _audioHelper.FindSession(processes);
 
-				if(!fp.ProcessName.Contains("FSD"))
-				{
-					return;
-				}
-				*/
+			foreach (var p in processes)
+			{
+				var displayName = (new NameAndIconHelper()).GetProcessInfo(p);
 
-				var processes = _audioHelper.GetPossibleProcesses();
-				var session = _audioHelper.FindSession(processes);
+				sb.AppendLine($"pid: {p.Id}");
+				sb.AppendLine($"\tprocessName: {p.ProcessName}");
+				sb.AppendLine($"\tDisplayName: {displayName}");
 
-				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();
+			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");
+			}
 		}
 
-		private void SetupAllSessionFields()
+		_tf.Text = sb.ToString();
+	}
+
+	private void SetupAllSessionFields()
+	{
+		_tf2.Text = "";
+		var sb = new StringBuilder();
+		sb.AppendLine("-------------------------------------------------------------------------------");
+
+		var deviceEnumerator = (IMMDeviceEnumerator)new MMDeviceEnumerator();
+
+		deviceEnumerator.EnumAudioEndpoints(DataFlow.Render, DeviceState.Active, out var deviceCollection);
+		deviceCollection.GetCount(out var num);
+
+
+		for (int i = 0; i < num; i++)
 		{
-			_tf2.Text = "";
-			var sb = new StringBuilder();
-			sb.AppendLine("-------------------------------------------------------------------------------");
+			deviceCollection.Item(i, out var device);
+			//todo: put the device name in the output
+			sb.AppendLine($"----");
 
-			var deviceEnumerator = new MMDeviceEnumerator(Guid.NewGuid());
 
-			using var device = deviceEnumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
-			using var manager = device.AudioSessionManager2;
+			Guid iid = typeof(IAudioSessionManager2).GUID;
+			device.Activate(ref iid, CLSCTX.ALL, IntPtr.Zero, out var m);
+			var manager = (IAudioSessionManager2)m;
 
-			var sessions = manager!.Sessions;
 
-			foreach (var session in sessions!)
+			manager.GetSessionEnumerator(out var sessionEnumerator);
+
+
+			sessionEnumerator.GetCount(out var count);
+			for (int s = 0; s < count; s++)
 			{
-				var audioProcess = Process.GetProcessById((int)session.ProcessID);
+				sessionEnumerator.GetSession(s, out var session);
 
-				var displayName = audioProcess!.MainModule!.FileVersionInfo.FileDescription;
+				session.GetProcessId(out var processId);
+				session.GetIconPath(out var path);
+				var audioProcess = Process.GetProcessById(processId);
 
-				sb.AppendLine($"pid: {audioProcess.Id}");
-				sb.AppendLine($"\tprocessName: {audioProcess.ProcessName}");
-				sb.AppendLine($"\tsession: {displayName}");
+				var displayName = (new NameAndIconHelper()).GetProcessInfo(audioProcess);
+				sb.AppendLine($"pid: {audioProcess.Id}\t\t processName: {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;
-			}
-		}
-
-	}
-}

src/SoundBrowser/SoundBrowser.csproj

@@ -7,10 +7,6 @@
     <UseWPF>true</UseWPF>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="CoreAudio" Version="1.27.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\FocusVolumeControl\FocusVolumeControl.csproj" />
   </ItemGroup>