Use LRU cache for icons to improve performance when changing back and forth between frequently used apps, and reduce possibility of an icon randomly not loading
This commit is contained in:
@ -5,44 +5,57 @@ using BarRaider.SdTools;
|
||||
using System.Drawing;
|
||||
using System.Runtime.InteropServices;
|
||||
using FocusVolumeControl.UI;
|
||||
using BitFaster.Caching.Lru;
|
||||
|
||||
namespace FocusVolumeControl.AudioSessions;
|
||||
|
||||
public sealed class ActiveAudioSessionWrapper : IAudioSession
|
||||
{
|
||||
static ConcurrentLru<string, string> _iconCache = new ConcurrentLru<string, string>(10);
|
||||
|
||||
public string DisplayName { get; set; }
|
||||
public string ExecutablePath { get; set; }
|
||||
public string IconPath { get; set; }
|
||||
private List<IAudioSessionControl2> Sessions { get; } = new List<IAudioSessionControl2>();
|
||||
private IEnumerable<ISimpleAudioVolume> Volume => Sessions.Cast<ISimpleAudioVolume>();
|
||||
|
||||
string _icon;
|
||||
string GetIconFromIconPath()
|
||||
{
|
||||
return _iconCache.GetOrAdd(IconPath, (key) =>
|
||||
{
|
||||
var tmp = (Bitmap)Bitmap.FromFile(IconPath);
|
||||
tmp.MakeTransparent();
|
||||
return Tools.ImageToBase64(tmp, true);
|
||||
});
|
||||
}
|
||||
|
||||
string GetIconFromExecutablePath()
|
||||
{
|
||||
return _iconCache.GetOrAdd(ExecutablePath, (key) =>
|
||||
{
|
||||
var tmp = IconExtraction.GetIcon(ExecutablePath);
|
||||
//var tmp = Icon.ExtractAssociatedIcon(ExecutablePath);
|
||||
return Tools.ImageToBase64(tmp, true);
|
||||
});
|
||||
}
|
||||
|
||||
public string GetIcon()
|
||||
{
|
||||
if (string.IsNullOrEmpty(_icon))
|
||||
try
|
||||
{
|
||||
try
|
||||
if (!string.IsNullOrEmpty(IconPath))
|
||||
{
|
||||
if(!string.IsNullOrEmpty(IconPath))
|
||||
{
|
||||
var tmp = (Bitmap)Bitmap.FromFile(IconPath);
|
||||
tmp.MakeTransparent();
|
||||
_icon = Tools.ImageToBase64(tmp, true);
|
||||
}
|
||||
else
|
||||
{
|
||||
var tmp = IconExtraction.GetIcon(ExecutablePath);
|
||||
//var tmp = Icon.ExtractAssociatedIcon(ExecutablePath);
|
||||
_icon = Tools.ImageToBase64(tmp, true);
|
||||
}
|
||||
return GetIconFromIconPath();
|
||||
}
|
||||
catch
|
||||
else
|
||||
{
|
||||
_icon = "Images/encoderIcon";
|
||||
return GetIconFromExecutablePath();
|
||||
}
|
||||
}
|
||||
return _icon;
|
||||
catch
|
||||
{
|
||||
return "Images/encoderIcon";
|
||||
}
|
||||
}
|
||||
|
||||
public bool Any()
|
||||
|
Reference in New Issue
Block a user