Update CHANGELOG to 1.3.1

App.xaml.cs

@@ -15,6 +15,8 @@ namespace unison
         {
             //debug language
             //unison.Resources.Resources.Culture = CultureInfo.GetCultureInfo("fr-FR");
+            //unison.Resources.Resources.Culture = CultureInfo.GetCultureInfo("es-ES");
+
 
             base.OnStartup(e);
 
@@ -37,7 +39,7 @@ namespace unison
         {
             _systray.Dispose();
             _snapcast.LaunchOrExit(true);
-            _hotkeys.RemoveHotKeys();
+            _hotkeys.RemoveHotkeys();
             base.OnExit(e);
         }
     }

CHANGELOG.md

@@ -0,0 +1,51 @@
+# Changelog
+
+## v1.3.1
+
+*Released: 03/11/2022*
+
+* Update .NET version from 5.0 to 6.0
+* Fix: simple patch to avoid a crash concerning GetAlbumCover
+* Fix: connection change now working
+
+## v1.3
+
+*Released: 18/04/2022*
+
+* New feature: add support for readpicture, aka embedded cover art
+* New feature: add support for MPD password
+* Spanish translation
+* Trim album release date
+* Cover icon when a radio is playing
+* Update MpcNET package from 1.3 to 1.4
+* Fix: Snapcast not working with hostname
+* Fix: some radios crash
+* Fix: disable/enable radios and Snapcast with connection
+
+## v1.2
+
+*Released: 07/04/2022*
+
+* New feature: support for custom shortcuts
+* New feature: MPD stats
+* Add GitHub repository link in settings
+* MpcNET NuGet package integration
+* Update Snapcast from v0.25 to v0.26
+* Fix: hostname supported for connection
+* Fix: crash when using invalid IP or Hostname
+* Fix: crash when no internet connection when using RadioBrowser
+
+## v1.1
+
+*Released: 04/10/2021*
+
+* Radio browser
+* Mute shortcut
+* Enter key works in settings textboxes
+* Share current song by double-clicking
+
+## v1.0
+
+*Released: 03/09/2021*
+
+* First release of unison

Handlers/HotkeyHandler.cs

@@ -15,21 +15,168 @@ namespace unison
 
         private const int HOTKEY_ID = 9000;
 
-        // modifiers
+        public enum MOD : int
-        private const uint MOD_NONE = 0x0000;
+        {
-        private const uint MOD_ALT = 0x0001;
+            None = 0x0000,
-        private const uint MOD_CONTROL = 0x0002;
+            Alt = 0x0001,
-        private const uint MOD_SHIFT = 0x0004;
+            Control = 0x0002,
-        private const uint MOD_WIN = 0x0008;
+            Shift = 0x0004,
+            //Win = 0x0008
+        };
 
         // reference => https://docs.microsoft.com/en-us/windows/win32/inputdev/virtual-key-codes
-        private const uint VK_MEDIA_PREV_TRACK = 0xB1;
+        public enum VK : int
-        private const uint VK_MEDIA_NEXT_TRACK = 0xB0;
+        {
-        private const uint VK_MEDIA_PLAY_PAUSE = 0xB3;
+            None = 0x00,
-        private const uint VK_VOLUME_UP = 0xAF;
+            Back = 0x08,
-        private const uint VK_VOLUME_DOWN = 0xAE;
+            Tab = 0x09,
-        private const uint VK_VOLUME_MUTE = 0xAD;
+            Clear = 0x0c,
-        private const uint VK_ENTER = 0x0D;
+            Return = 0x0d,
+            Menu = 0x12,
+            Pause = 0x13,
+            Capital = 0x14,
+            Kana = 0x15,
+            Hangul = 0x15,
+            Junja = 0x17,
+            Final = 0x18,
+            Hanja = 0x19,
+            Kanji = 0x19,
+            Escape = 0x1b,
+            Convert = 0x1c,
+            NonConvert = 0x1d,
+            Accept = 0x1e,
+            ModeChange = 0x1f,
+            Space = 0x20,
+            Prior = 0x21,
+            Next = 0x22,
+            End = 0x23,
+            Home = 0x24,
+            Left = 0x25,
+            Up = 0x26,
+            Right = 0x27,
+            Down = 0x28,
+            Select = 0x29,
+            Print = 0x2a,
+            Execute = 0x2b,
+            Snapshot = 0x2c,
+            Insert = 0x2d,
+            Delete = 0x2e,
+            Help = 0x2f,
+            NumRow0 = 0x30,
+            NumRow1 = 0x31,
+            NumRow2 = 0x32,
+            NumRow3 = 0x33,
+            NumRow4 = 0x34,
+            NumRow5 = 0x35,
+            NumRow6 = 0x36,
+            NumRow7 = 0x37,
+            NumRow8 = 0x38,
+            NumRow9 = 0x39,
+            A = 0x41,
+            B = 0x42,
+            C = 0x43,
+            D = 0x44,
+            E = 0x45,
+            F = 0x46,
+            G = 0x47,
+            H = 0x48,
+            I = 0x49,
+            J = 0x4a,
+            K = 0x4b,
+            L = 0x4c,
+            M = 0x4d,
+            N = 0x4e,
+            O = 0x4f,
+            P = 0x50,
+            Q = 0x51,
+            R = 0x52,
+            S = 0x53,
+            T = 0x54,
+            U = 0x55,
+            V = 0x56,
+            W = 0x57,
+            X = 0x58,
+            Y = 0x59,
+            Z = 0x5a,
+            Apps = 0x5d,
+            Sleep = 0x5f,
+            NumPad0 = 0x60,
+            NumPad1 = 0x61,
+            NumPad2 = 0x62,
+            NumPad3 = 0x63,
+            NumPad4 = 0x64,
+            NumPad5 = 0x65,
+            NumPad6 = 0x66,
+            NumPad7 = 0x67,
+            NumPad8 = 0x68,
+            NumPad9 = 0x69,
+            Multiply = 0x6a,
+            Add = 0x6b,
+            Separator = 0x6c,
+            Subtract = 0x6d,
+            Decimal = 0x6e,
+            Divide = 0x6f,
+            F1 = 0x70,
+            F2 = 0x71,
+            F3 = 0x72,
+            F4 = 0x73,
+            F5 = 0x74,
+            F6 = 0x75,
+            F7 = 0x76,
+            F8 = 0x77,
+            F9 = 0x78,
+            F10 = 0x79,
+            F11 = 0x7a,
+            F12 = 0x7b,
+            F13 = 0x7c,
+            F14 = 0x7d,
+            F15 = 0x7e,
+            F16 = 0x7f,
+            F17 = 0x80,
+            F18 = 0x81,
+            F19 = 0x82,
+            F20 = 0x83,
+            F21 = 0x84,
+            F22 = 0x85,
+            F23 = 0x86,
+            F24 = 0x87,
+            NumLock = 0x90,
+            Scroll = 0x91,
+            LMenu = 0xa4,
+            RMenu = 0xa5,
+            BrowserBack = 0xa6,
+            BrowserForward = 0xa7,
+            BrowserRefresh = 0xa8,
+            BrowserStop = 0xa9,
+            BrowserSearch = 0xaa,
+            BrowserFavorites = 0xab,
+            BrowserHome = 0xac,
+            VolumeMute = 0xad,
+            VolumeDown = 0xae,
+            VolumeUp = 0xaf,
+            MediaNextTrack = 0xb0,
+            MediaPreviousTrack = 0xb1,
+            MediaStop = 0xb2,
+            MediaPlayPause = 0xb3,
+            LaunchMail = 0xb4,
+            LaunchMediaSelect = 0xb5,
+            LaunchApp1 = 0xb6,
+            LaunchApp2 = 0xb7,
+        };
+
+        public struct HotkeyPair
+        {
+            public MOD mod;
+            public VK vk;
+
+            public HotkeyPair(MOD _mod, VK _vk) { mod = _mod; vk = _vk; }
+            
+            public uint GetMOD() { return (uint)mod; }
+            public uint GetVK() { return (uint)vk; }
+
+            public void SetMOD(MOD modmod) { mod = modmod; }
+            public void SetVK(VK vkvk) { vk = vkvk; }
+        }
 
         private MainWindow _appWindow;
         private readonly MPDHandler _mpd;
@@ -37,9 +184,31 @@ namespace unison
         private IntPtr _windowHandle;
         private HwndSource _source;
 
+        public HotkeyPair _NextTrack;
+        public HotkeyPair _PreviousTrack;
+        public HotkeyPair _PlayPause;
+        public HotkeyPair _VolumeUp;
+        public HotkeyPair _VolumeDown;
+        public HotkeyPair _VolumeMute;
+        public HotkeyPair _ShowWindow;
+        public HotkeyPair[] _Shortcuts;
+
         public HotkeyHandler()
         {
             _mpd = (MPDHandler)Application.Current.Properties["mpd"];
+            Initialize();
+        }
+
+        public void Initialize()
+        {
+            _NextTrack = new HotkeyPair((MOD)Properties.Settings.Default.nextTrack_mod, (VK)Properties.Settings.Default.nextTrack_vk);
+            _PreviousTrack = new HotkeyPair((MOD)Properties.Settings.Default.previousTrack_mod, (VK)Properties.Settings.Default.previousTrack_vk);
+            _PlayPause = new HotkeyPair((MOD)Properties.Settings.Default.playPause_mod, (VK)Properties.Settings.Default.playPause_vk);
+            _VolumeUp = new HotkeyPair((MOD)Properties.Settings.Default.volumeUp_mod, (VK)Properties.Settings.Default.volumeUp_vk);
+            _VolumeDown = new HotkeyPair((MOD)Properties.Settings.Default.volumeDown_mod, (VK)Properties.Settings.Default.volumeDown_vk);
+            _VolumeMute = new HotkeyPair((MOD)Properties.Settings.Default.volumeMute_mod, (VK)Properties.Settings.Default.volumeMute_vk);
+            _ShowWindow = new HotkeyPair((MOD)Properties.Settings.Default.showWindow_mod, (VK)Properties.Settings.Default.showWindow_vk);
+            _Shortcuts = new HotkeyPair[] { _NextTrack, _PreviousTrack, _PlayPause, _VolumeUp, _VolumeDown, _VolumeMute, _ShowWindow };
         }
 
         public void Activate(Window win)
@@ -48,18 +217,28 @@ namespace unison
             {
                 _windowHandle = new WindowInteropHelper(win).Handle;
                 _source = HwndSource.FromHwnd(_windowHandle);
-                _source.AddHook(HwndHook);
+                AddHotkeys();
-
-                RegisterHotKey(_windowHandle, HOTKEY_ID, MOD_CONTROL, VK_MEDIA_PREV_TRACK);
-                RegisterHotKey(_windowHandle, HOTKEY_ID, MOD_CONTROL, VK_MEDIA_NEXT_TRACK);
-                RegisterHotKey(_windowHandle, HOTKEY_ID, MOD_CONTROL, VK_MEDIA_PLAY_PAUSE);
-                RegisterHotKey(_windowHandle, HOTKEY_ID, MOD_CONTROL, VK_VOLUME_UP);
-                RegisterHotKey(_windowHandle, HOTKEY_ID, MOD_CONTROL, VK_VOLUME_DOWN);
-                RegisterHotKey(_windowHandle, HOTKEY_ID, MOD_CONTROL, VK_VOLUME_MUTE);
-                RegisterHotKey(_windowHandle, HOTKEY_ID, MOD_CONTROL | MOD_ALT, VK_ENTER);
             }
         }
 
+        public void AddHotkeys()
+        {
+            _source.AddHook(HwndHook);
+            RegisterHotKey(_windowHandle, HOTKEY_ID, _NextTrack.GetMOD(), _NextTrack.GetVK());
+            RegisterHotKey(_windowHandle, HOTKEY_ID, _PreviousTrack.GetMOD(), _PreviousTrack.GetVK());
+            RegisterHotKey(_windowHandle, HOTKEY_ID, _PlayPause.GetMOD(), _PlayPause.GetVK());
+            RegisterHotKey(_windowHandle, HOTKEY_ID, _VolumeUp.GetMOD(), _VolumeUp.GetVK());
+            RegisterHotKey(_windowHandle, HOTKEY_ID, _VolumeDown.GetMOD(), _VolumeDown.GetVK());
+            RegisterHotKey(_windowHandle, HOTKEY_ID, _VolumeMute.GetMOD(), _VolumeMute.GetVK());
+            RegisterHotKey(_windowHandle, HOTKEY_ID, _ShowWindow.GetMOD(), _ShowWindow.GetVK());
+        }
+
+        public void RemoveHotkeys()
+        {
+            _source.RemoveHook(HwndHook);
+            UnregisterHotKey(_windowHandle, HOTKEY_ID);
+        }
+
         private IntPtr HwndHook(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
         {
             const int WM_HOTKEY = 0x0312;
@@ -67,61 +246,48 @@ namespace unison
             if (msg == WM_HOTKEY && wParam.ToInt32() == HOTKEY_ID)
             {
                 uint vkey = ((uint)lParam >> 16) & 0xFFFF;
-                switch (vkey)
-                {
-                    case VK_MEDIA_NEXT_TRACK:
-                        _mpd.Next();
-                        break;
-                    case VK_MEDIA_PREV_TRACK:
-                        _mpd.Prev();
-                        break;
-                    case VK_VOLUME_DOWN:
-                        _mpd.VolumeDown();
-                        break;
-                    case VK_VOLUME_UP:
-                        _mpd.VolumeUp();
-                        break;
-                    case VK_VOLUME_MUTE:
-                        _mpd.VolumeMute();
-                        break;
-                    case VK_MEDIA_PLAY_PAUSE:
-                        _mpd.PlayPause();
-                        break;
-                    case VK_ENTER:
-                        if (_appWindow == null)
-                            _appWindow = (MainWindow)Application.Current.MainWindow;
 
-                        if (_appWindow.WindowState == WindowState.Minimized)
+                if (vkey == _NextTrack.GetVK())
+                    _mpd.Next();
+                else if (vkey == _PreviousTrack.GetVK())
+                    _mpd.Prev();
+                else if (vkey == _PlayPause.GetVK())
+                    _mpd.PlayPause();
+                else if (vkey == _VolumeUp.GetVK())
+                    _mpd.VolumeUp();
+                else if (vkey == _VolumeDown.GetVK())
+                    _mpd.VolumeDown();
+                else if (vkey == _VolumeMute.GetVK())
+                    _mpd.VolumeMute();
+                else if (vkey == _ShowWindow.GetVK())
+                {
+                    if (_appWindow == null)
+                        _appWindow = (MainWindow)Application.Current.MainWindow;
+
+                    if (_appWindow.WindowState == WindowState.Minimized)
+                    {
+                        _appWindow.Show();
+                        _appWindow.Activate();
+                        _appWindow.WindowState = WindowState.Normal;
+                    }
+                    else
+                    {
+                        if (_appWindow.IsActive)
+                        {
+                            _appWindow.Hide();
+                            _appWindow.WindowState = WindowState.Minimized;
+                        }
+                        else // not minimized but not in front
                         {
                             _appWindow.Show();
                             _appWindow.Activate();
                             _appWindow.WindowState = WindowState.Normal;
                         }
-                        else
+                    }
-                        {
-                            if (_appWindow.IsActive)
-                            {
-                                _appWindow.Hide();
-                                _appWindow.WindowState = WindowState.Minimized;
-                            }
-                            else  // not minimized but not in front
-                            {
-                                _appWindow.Show();
-                                _appWindow.Activate();
-                                _appWindow.WindowState = WindowState.Normal;
-                            }
-                        }
-                        break;
                 }
                 handled = true;
             }
             return IntPtr.Zero;
         }
-
-        public void RemoveHotKeys()
-        {
-            _source.RemoveHook(HwndHook);
-            UnregisterHotKey(_windowHandle, HOTKEY_ID);
-        }
     }
 }

Handlers/MPDHandler.cs

@@ -20,6 +20,17 @@ using MpcNET.Types;
 
 namespace unison
 {
+    public class Statistics
+    {
+        public int Songs { get; set; }
+        public int Albums { get; set; }
+        public int Artists { get; set; }
+        public string TotalPlaytime { get; set; }
+        public string Uptime { get; set; }
+        public string TotalTimePlayed { get; set; }
+        public string DatabaseUpdate { get; set; }
+    }
+
     public class MPDHandler
     {
         private bool _connected;
@@ -36,12 +47,15 @@ namespace unison
         private MpdStatus _currentStatus;
         private IMpdFile _currentSong;
         private BitmapFrame _cover;
+        public Statistics _stats;
         private readonly System.Timers.Timer _elapsedTimer;
         private DispatcherTimer _retryTimer;
 
         bool _isUpdatingStatus = false;
         bool _isUpdatingSong = false;
 
+        public IPAddress _ipAddress;
+
         private event EventHandler ConnectionChanged;
         private event EventHandler StatusChanged;
         private event EventHandler SongChanged;
@@ -50,17 +64,19 @@ namespace unison
         private MpcConnection _connection;
         private MpcConnection _commandConnection;
         private IPEndPoint _mpdEndpoint;
-        private CancellationTokenSource cancelToken;
+
+        private CancellationTokenSource _cancelCommand;
+        private CancellationTokenSource _cancelConnect;
 
         public MPDHandler()
         {
-            cancelToken = new CancellationTokenSource();
+            Startup(null, null);
 
-            Initialize(null, null);
+            _stats = new Statistics();
 
             _retryTimer = new DispatcherTimer();
             _retryTimer.Interval = TimeSpan.FromSeconds(5);
-            _retryTimer.Tick += Initialize;
+            _retryTimer.Tick += Startup;
 
             _elapsedTimer = new System.Timers.Timer(500);
             _elapsedTimer.Elapsed += new System.Timers.ElapsedEventHandler(ElapsedTimer);
@@ -133,7 +149,7 @@ namespace unison
 
         public async Task<T> SafelySendCommandAsync<T>(IMpcCommand<T> command)
         {
-            if (_commandConnection == null)
+            if (_commandConnection == null || !IsConnected())
             {
                 Trace.WriteLine("[SafelySendCommandAsync] no command connection");
                 return default(T);
@@ -144,7 +160,7 @@ namespace unison
                 IMpdMessage<T> response = await _commandConnection.SendAsync(command);
                 if (!response.IsResponseValid)
                 {
-                    var mpdError = response.Response?.Result?.MpdError;
+                    string mpdError = response.Response?.Result?.MpdError;
                     if (mpdError != null && mpdError != "")
                         throw new Exception(mpdError);
                     else
@@ -161,23 +177,59 @@ namespace unison
             return default(T);
         }
 
-        private void Initialize(object sender, EventArgs e)
+        public async void Startup(object sender, EventArgs e)
         {
-            if (!_connected)
+            await Initialize();
-                Connect();
         }
 
-        public async void Connect()
+        public async Task Initialize()
         {
-            CancellationToken token = cancelToken.Token;
+            Trace.WriteLine("Initializing");
+
+            Disconnected();
+
+            if (!_connected)
+                await Connect();
+        }
+
+        public void Disconnected()
+        {
+            _connected = false;
+            ConnectionChanged?.Invoke(this, EventArgs.Empty);
+
+            _commandConnection?.DisconnectAsync();
+            _connection?.DisconnectAsync();
+
+            _cancelConnect?.Cancel();
+            _cancelConnect = new CancellationTokenSource();
+
+            _cancelCommand?.Cancel();
+            _cancelCommand = new CancellationTokenSource();
+
+            _connection = null;
+            _commandConnection = null;
+
+            Trace.WriteLine("Disconnected");
+        }
+
+        public async Task Connect()
+        {
+            Trace.WriteLine("Connecting");
+
+            if (_cancelCommand.IsCancellationRequested || _cancelConnect.IsCancellationRequested)
+                return;
+
             try
             {
-                _connection = await ConnectInternal(token);
+                _connection = await ConnectInternal(_cancelConnect.Token);
-                _commandConnection = await ConnectInternal(token);
+                _commandConnection = await ConnectInternal(_cancelCommand.Token);
             }
-            catch(MpcNET.Exceptions.MpcConnectException exception)
+            catch (MpcNET.Exceptions.MpcConnectException e)
             {
-                Trace.WriteLine("exception: " + exception);
+                _connected = false;
+                Trace.WriteLine($"Error in connect: {e.Message}");
+                ConnectionChanged?.Invoke(this, EventArgs.Empty);
+                return;
             }
             if (_connection != null && _commandConnection != null)
             {
@@ -190,6 +242,7 @@ namespace unison
             }
             else
             {
+                _connected = false;
                 ConnectionChanged?.Invoke(this, EventArgs.Empty);
                 return;
             }
@@ -197,18 +250,41 @@ namespace unison
             await UpdateStatusAsync();
             await UpdateSongAsync();
 
-            Loop(token);
+            Loop(_cancelCommand.Token);
         }
 
         private async Task<MpcConnection> ConnectInternal(CancellationToken token)
         {
-            IPAddress.TryParse(Properties.Settings.Default.mpd_host, out IPAddress ipAddress);
+            if (token.IsCancellationRequested)
+                return null;
 
-            _mpdEndpoint = new IPEndPoint(ipAddress, Properties.Settings.Default.mpd_port);
+            IPAddress.TryParse(Properties.Settings.Default.mpd_host, out _ipAddress);
+
+            if (_ipAddress == null)
+            {
+                try
+                {
+                    IPAddress[] addrList = Dns.GetHostAddresses(Properties.Settings.Default.mpd_host);
+                    if (addrList.Length > 0)
+                    {
+                        foreach (IPAddress addr in addrList)
+                        {
+                            if (addr.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
+                                _ipAddress = addr;
+                        }
+                    }
+                }
+                catch (Exception)
+                {
+                    throw new MpcNET.Exceptions.MpcConnectException("No correct IP provided by user.");
+                }
+            }
+
+            _mpdEndpoint = new IPEndPoint(_ipAddress, Properties.Settings.Default.mpd_port);
             MpcConnection connection = new MpcConnection(_mpdEndpoint);
             await connection.ConnectAsync(token);
 
-            /*if (!string.IsNullOrEmpty(Properties.Settings.Default.mpd_password))
+            if (!string.IsNullOrEmpty(Properties.Settings.Default.mpd_password))
             {
                 IMpdMessage<string> result = await connection.SendAsync(new PasswordCommand(Properties.Settings.Default.mpd_password));
                 if (!result.IsResponseValid)
@@ -216,21 +292,11 @@ namespace unison
                     string mpdError = result.Response?.Result?.MpdError;
                     Trace.WriteLine(mpdError);
                 }
-            }*/
+            }
 
             return connection;
         }
 
-        private void Disconnected()
-        {
-            _connected = false;
-
-            _connection = null;
-            _commandConnection = null;
-
-            ConnectionChanged?.Invoke(this, EventArgs.Empty);
-        }
-
         private void Loop(CancellationToken token)
         {
             Task.Run(async () =>
@@ -239,24 +305,31 @@ namespace unison
                 {
                     try
                     {
-                        if (token.IsCancellationRequested || _connection == null)
+                        if (token.IsCancellationRequested || _connection == null || !IsConnected())
                             break;
 
-                        var idleChanges = await _connection.SendAsync(new IdleCommand("stored_playlist playlist player mixer output options"));
+                        IMpdMessage<string> idleChanges = await _connection.SendAsync(new IdleCommand("stored_playlist playlist player mixer output options update"));
 
                         if (idleChanges.IsResponseValid)
                             await HandleIdleResponseAsync(idleChanges.Response.Content);
                         else
+                        {
+                            Trace.WriteLine($"Error in Idle connection thread (1): {idleChanges.Response?.Content}");
                             throw new Exception(idleChanges.Response?.Content);
+                        }
                     }
                     catch (Exception e)
                     {
-                        Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+                        if (token.IsCancellationRequested)
-                        Disconnected();
+                            Trace.WriteLine($"Idle connection cancelled.");
+                        else
+                            Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+                        await Initialize();
+                        break;
                     }
                 }
 
-            }).ConfigureAwait(false);
+            }, token).ConfigureAwait(false);
         }
 
         private async Task HandleIdleResponseAsync(string subsystems)
@@ -274,6 +347,7 @@ namespace unison
             catch (Exception e)
             {
                 Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+                await Initialize();
             }
         }
 
@@ -298,6 +372,7 @@ namespace unison
             catch (Exception e)
             {
                 Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+                await Initialize();
             }
 
             _isUpdatingStatus = false;
@@ -305,6 +380,8 @@ namespace unison
 
         private async Task UpdateSongAsync()
         {
+            Trace.WriteLine("Updating song");
+
             if (_connection == null || _isUpdatingSong)
                 return;
 
@@ -324,39 +401,70 @@ namespace unison
             catch (Exception e)
             {
                 Trace.WriteLine($"Error in Idle connection thread: {e.Message}");
+                await Initialize();
             }
 
             _isUpdatingSong = false;
         }
 
-        private async void GetAlbumCover(string path, CancellationToken token = default)
+        private async void GetAlbumCover(string path, CancellationToken token)
         {
+            if (token.IsCancellationRequested)
+                return;
+
             List<byte> data = new List<byte>();
             try
             {
-                if (_connection == null)
+                bool ReadPictureFailed = true;
-                    return;
-
                 long totalBinarySize = 9999;
                 long currentSize = 0;
 
                 do
                 {
-                    var albumReq = await _connection.SendAsync(new AlbumArtCommand(path, currentSize));
+                    if (_connection == null)
+                        return;
+
+                    IMpdMessage<MpdBinaryData> albumReq = await _connection.SendAsync(new AlbumArtCommand(path, currentSize));
                     if (!albumReq.IsResponseValid)
                         break;
 
-                    var response = albumReq.Response.Content;
+                    MpdBinaryData response = albumReq.Response.Content;
-                    if (response.Binary == 0)
+                    if (response == null || response.Binary == 0)
+                        break;
+
+                    ReadPictureFailed = false;
+                    totalBinarySize = response.Size;
+                    currentSize += response.Binary;
+                    data.AddRange(response.Data);
+                }
+                while (currentSize < totalBinarySize && !token.IsCancellationRequested);
+
+                do
+                {
+                    if (!ReadPictureFailed)
+                        break;
+                    if (_connection == null)
+                        return;
+
+                    IMpdMessage<MpdBinaryData> albumReq = await _connection.SendAsync(new ReadPictureCommand(path, currentSize));
+                    if (!albumReq.IsResponseValid)
+                        break;
+
+                    MpdBinaryData response = albumReq.Response.Content;
+                    if (response == null || response.Binary == 0)
                         break;
 
                     totalBinarySize = response.Size;
                     currentSize += response.Binary;
                     data.AddRange(response.Data);
-                } while (currentSize < totalBinarySize && !token.IsCancellationRequested);
+                }
+                while (currentSize < totalBinarySize && !token.IsCancellationRequested);
             }
             catch (Exception e)
             {
+                if (token.IsCancellationRequested)
+                    return;
+
                 Trace.WriteLine("Exception caught while getting albumart: " + e);
                 return;
             }
@@ -370,7 +478,7 @@ namespace unison
                 {
                     _cover = BitmapFrame.Create(stream, BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
                 }
-                catch (System.NotSupportedException)
+                catch
                 {
                     _cover = null;
                 }
@@ -405,7 +513,7 @@ namespace unison
             SongChanged?.Invoke(this, EventArgs.Empty);
 
             string uri = Regex.Escape(_currentSong.Path);
-            GetAlbumCover(uri);
+            GetAlbumCover(uri, _cancelCommand.Token);
         }
 
         public void UpdateCover()
@@ -417,6 +525,7 @@ namespace unison
         public MpdStatus GetStatus() => _currentStatus;
         public BitmapFrame GetCover() => _cover;
         public string GetVersion() => _version;
+        public Statistics GetStats() => _stats;
         public double GetCurrentTime() => _currentTime;
 
         public bool IsConnected() => _connected;
@@ -470,7 +579,6 @@ namespace unison
 
         public void AddSong(string Uri)
         {
-            Debug.WriteLine("AddCommand path: " + Uri);
             SendCommand(new AddCommand(Uri));
         }
 
@@ -479,5 +587,28 @@ namespace unison
             CommandList commandList = new CommandList(new IMpcCommand<object>[] { new ClearCommand(), new AddCommand(Uri), new PlayCommand(0) });
             SendCommand(commandList);
         }
+
+        public async void QueryStats()
+        {
+            Dictionary<string, string> response = await SafelySendCommandAsync(new StatsCommand());
+
+            if (response != null)
+            {
+                _stats.Songs = int.Parse(response["songs"]);
+                _stats.Albums = int.Parse(response["albums"]);
+                _stats.Artists = int.Parse(response["artists"]);
+
+                TimeSpan time;
+                time = TimeSpan.FromSeconds(int.Parse(response["uptime"]));
+                _stats.Uptime = time.ToString(@"dd\:hh\:mm\:ss");
+                time = TimeSpan.FromSeconds(int.Parse(response["db_playtime"]));
+                _stats.TotalPlaytime = time.ToString(@"dd\:hh\:mm\:ss");
+                time = TimeSpan.FromSeconds(int.Parse(response["playtime"]));
+                _stats.TotalTimePlayed = time.ToString(@"dd\:hh\:mm\:ss");
+
+                DateTime date = new DateTime(1970, 1, 1).AddSeconds(int.Parse(response["db_update"])).ToLocalTime();
+                _stats.DatabaseUpdate = date.ToString("dd/MM/yyyy @ HH:mm");
+            }
+        }
     }
 }

Handlers/SnapcastHandler.cs

@@ -14,7 +14,7 @@ namespace unison
         {
             if (Properties.Settings.Default.snapcast_startup)
             {
-                var mpd = (MPDHandler)Application.Current.Properties["mpd"];
+                MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
                 if (mpd.IsConnected())
                     LaunchOrExit();
             }
@@ -37,8 +37,10 @@ namespace unison
         {
             if (!HasStarted && !ForceExit)
             {
+                MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
+
                 _snapcast.StartInfo.FileName = Properties.Settings.Default.snapcast_path + @"\snapclient.exe";
-                _snapcast.StartInfo.Arguments = $"--host {Properties.Settings.Default.mpd_host}";
+                _snapcast.StartInfo.Arguments = $"--host {mpd._ipAddress}";
                 _snapcast.StartInfo.CreateNoWindow = !Properties.Settings.Default.snapcast_window;
                 try
                 {

LICENSE

@@ -1,4 +1,4 @@
-MIT License Copyright (c) 2021 Théo Marchal
+MIT License Copyright (c) 2022 Théo Marchal
 
 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:

Properties/Settings.Designer.cs

@@ -73,7 +73,19 @@ namespace unison.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("snapclient_0.25.0-1_win64")]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool snapcast_window {
+            get {
+                return ((bool)(this["snapcast_window"]));
+            }
+            set {
+                this["snapcast_window"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("snapclient_0.26.0-1_win64")]
         public string snapcast_path {
             get {
                 return ((string)(this["snapcast_path"]));
@@ -109,13 +121,169 @@ namespace unison.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
-        public bool snapcast_window {
+        public uint nextTrack_mod {
             get {
-                return ((bool)(this["snapcast_window"]));
+                return ((uint)(this["nextTrack_mod"]));
             }
             set {
-                this["snapcast_window"] = value;
+                this["nextTrack_mod"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("176")]
+        public uint nextTrack_vk {
+            get {
+                return ((uint)(this["nextTrack_vk"]));
+            }
+            set {
+                this["nextTrack_vk"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        public uint previousTrack_mod {
+            get {
+                return ((uint)(this["previousTrack_mod"]));
+            }
+            set {
+                this["previousTrack_mod"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("177")]
+        public uint previousTrack_vk {
+            get {
+                return ((uint)(this["previousTrack_vk"]));
+            }
+            set {
+                this["previousTrack_vk"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        public uint playPause_mod {
+            get {
+                return ((uint)(this["playPause_mod"]));
+            }
+            set {
+                this["playPause_mod"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("179")]
+        public uint playPause_vk {
+            get {
+                return ((uint)(this["playPause_vk"]));
+            }
+            set {
+                this["playPause_vk"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        public uint volumeUp_mod {
+            get {
+                return ((uint)(this["volumeUp_mod"]));
+            }
+            set {
+                this["volumeUp_mod"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("175")]
+        public uint volumeUp_vk {
+            get {
+                return ((uint)(this["volumeUp_vk"]));
+            }
+            set {
+                this["volumeUp_vk"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        public uint volumeDown_mod {
+            get {
+                return ((uint)(this["volumeDown_mod"]));
+            }
+            set {
+                this["volumeDown_mod"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("174")]
+        public uint volumeDown_vk {
+            get {
+                return ((uint)(this["volumeDown_vk"]));
+            }
+            set {
+                this["volumeDown_vk"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("2")]
+        public uint volumeMute_mod {
+            get {
+                return ((uint)(this["volumeMute_mod"]));
+            }
+            set {
+                this["volumeMute_mod"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("173")]
+        public uint volumeMute_vk {
+            get {
+                return ((uint)(this["volumeMute_vk"]));
+            }
+            set {
+                this["volumeMute_vk"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("3")]
+        public uint showWindow_mod {
+            get {
+                return ((uint)(this["showWindow_mod"]));
+            }
+            set {
+                this["showWindow_mod"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("13")]
+        public uint showWindow_vk {
+            get {
+                return ((uint)(this["showWindow_vk"]));
+            }
+            set {
+                this["showWindow_vk"] = value;
             }
         }
     }

Properties/Settings.settings

@@ -18,7 +18,7 @@
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="snapcast_path" Type="System.String" Scope="User">
-      <Value Profile="(Default)">snapclient_0.25.0-1_win64</Value>
+      <Value Profile="(Default)">snapclient_0.26.0-1_win64</Value>
     </Setting>
     <Setting Name="snapcast_port" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">1704</Value>
@@ -26,5 +26,47 @@
     <Setting Name="volume_offset" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">5</Value>
     </Setting>
+    <Setting Name="nextTrack_mod" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="nextTrack_vk" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">176</Value>
+    </Setting>
+    <Setting Name="previousTrack_mod" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="previousTrack_vk" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">177</Value>
+    </Setting>
+    <Setting Name="playPause_mod" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="playPause_vk" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">179</Value>
+    </Setting>
+    <Setting Name="volumeUp_mod" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="volumeUp_vk" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">175</Value>
+    </Setting>
+    <Setting Name="volumeDown_mod" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="volumeDown_vk" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">174</Value>
+    </Setting>
+    <Setting Name="volumeMute_mod" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">2</Value>
+    </Setting>
+    <Setting Name="volumeMute_vk" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">173</Value>
+    </Setting>
+    <Setting Name="showWindow_mod" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">3</Value>
+    </Setting>
+    <Setting Name="showWindow_vk" Type="System.UInt32" Scope="User">
+      <Value Profile="(Default)">13</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

README.md

@@ -5,7 +5,7 @@
 **unison** is a very simple [Music Player Daemon (MPD)](https://www.musicpd.org/) daemon client with the following goals:
 
 * lightweight window that can be toggled with shortcuts
-* music control through shortcuts
+* music control through rebindable shortcuts
 * [Snapcast](https://mjaggard.github.io/snapcast/) integration
 * Radio stations
 
@@ -19,32 +19,25 @@ By default, unison works as a daemon in the taskbar system tray. You can display
 
 ### Shortcuts
 
-You can control your music at anytime with the shortcuts. They can of course be used if the window is not visible.
+You can control your music at anytime with the shortcuts. They are usable system-wide, even if the window is not visible. They are of course fully rebindable.
 
 ![Settings => shortcuts](Screenshots/screen3.png)
 
 ### Snapcast
 
-The main goal of embedding Snapcast is the ability to listen locally to music when I'm not using my main audio system. The computer running unison can then play music easily.
+Embedding a Snapcast client allows to listen to music on multiple devices. For example, if you music is on a distant server connected to speakers in your living room, you can still listen to it on your computer running unison with this integrated client.
 
 ### Radio stations
 
-Through [Radio-Browser](https://www.radio-browser.info), a community database, you can play radio-streams directly from unison. There are more than 28,000 stations recorded on this service, so it should be a nice way to discover new music and cultures.
+Through [Radio-Browser](https://www.radio-browser.info), a community database, you can play radio streams directly from unison. There are more than 28,000 stations recorded on this service, so it is a nice way to discover new music and cultures.
 
 ![Radio stations](Screenshots/screen4.png)
 
-## Caveats
+## Planned features
-
-### Missing features
-
-* Custom shortcuts.
-* MPD passwords: I don't really see the point, but if asked, I will integrate them.
-* Any sort of playlist and queue management. I use other software to do it, but I might implement them at some point.
-
-### Wanted features
 
 * A complete shuffle system based on set criteria, aka a smart playlist.
+* Playlist, queue and library management. I use other software to do it, but I will implement them at some point.
 
 ## Translations
 
-unison is translated in English and French. You can contribute if you want!
+unison is translated in English, French and Spanish. You can contribute if you want!

Resources/Resources.Designer.cs

@@ -196,7 +196,25 @@ namespace unison.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connected to MPD.
+        ///   Looks up a localized string similar to Please note that since MPD passwords are not secure (they are sent in plain text to the server), there are saved as is in the setting file..
+        /// </summary>
+        public static string Settings_ConnectionPasswordInfo {
+            get {
+                return ResourceManager.GetString("Settings_ConnectionPasswordInfo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Status:.
+        /// </summary>
+        public static string Settings_ConnectionStatus {
+            get {
+                return ResourceManager.GetString("Settings_ConnectionStatus", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to connected to MPD.
         /// </summary>
         public static string Settings_ConnectionStatusConnected {
             get {
@@ -205,7 +223,7 @@ namespace unison.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Connecting....
+        ///   Looks up a localized string similar to connecting....
         /// </summary>
         public static string Settings_ConnectionStatusConnecting {
             get {
@@ -214,7 +232,7 @@ namespace unison.Resources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Not connected..
+        ///   Looks up a localized string similar to not connected..
         /// </summary>
         public static string Settings_ConnectionStatusOffline {
             get {
@@ -249,15 +267,6 @@ namespace unison.Resources {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to &apos;s updated MpcNET.
-        /// </summary>
-        public static string Settings_MpcNET {
-            get {
-                return ResourceManager.GetString("Settings_MpcNET", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Next track.
         /// </summary>
@@ -267,6 +276,15 @@ namespace unison.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Password.
+        /// </summary>
+        public static string Settings_Password {
+            get {
+                return ResourceManager.GetString("Settings_Password", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Play / pause.
         /// </summary>
@@ -303,6 +321,24 @@ namespace unison.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Please note that if the input key is not recognized, this is due to a limitation on how virtual keys work..
+        /// </summary>
+        public static string Settings_ShortcutsInfo {
+            get {
+                return ResourceManager.GetString("Settings_ShortcutsInfo", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Enter a key....
+        /// </summary>
+        public static string Settings_ShortcutsKey {
+            get {
+                return ResourceManager.GetString("Settings_ShortcutsKey", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Show window.
         /// </summary>
@@ -501,6 +537,78 @@ namespace unison.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Stats.
+        /// </summary>
+        public static string Stats {
+            get {
+                return ResourceManager.GetString("Stats", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Albums:.
+        /// </summary>
+        public static string Stats_Albums {
+            get {
+                return ResourceManager.GetString("Stats_Albums", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Artists:.
+        /// </summary>
+        public static string Stats_Artists {
+            get {
+                return ResourceManager.GetString("Stats_Artists", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Last database update:.
+        /// </summary>
+        public static string Stats_LastDatabaseUpdate {
+            get {
+                return ResourceManager.GetString("Stats_LastDatabaseUpdate", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Songs:.
+        /// </summary>
+        public static string Stats_Songs {
+            get {
+                return ResourceManager.GetString("Stats_Songs", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Total playtime:.
+        /// </summary>
+        public static string Stats_TotalPlaytime {
+            get {
+                return ResourceManager.GetString("Stats_TotalPlaytime", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Total time played:.
+        /// </summary>
+        public static string Stats_TotalTimePlayed {
+            get {
+                return ResourceManager.GetString("Stats_TotalTimePlayed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to MPD uptime:.
+        /// </summary>
+        public static string Stats_Uptime {
+            get {
+                return ResourceManager.GetString("Stats_Uptime", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Stop Snapcast.
         /// </summary>

Resources/Resources.es-ES.resx

@@ -0,0 +1,306 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Exit" xml:space="preserve">
+    <value>Salir</value>
+  </data>
+  <data name="Radios" xml:space="preserve">
+    <value>Radios</value>
+  </data>
+  <data name="Radio_Country" xml:space="preserve">
+    <value>Países</value>
+  </data>
+  <data name="Radio_Loading" xml:space="preserve">
+    <value>Cargando estaciones...</value>
+  </data>
+  <data name="Radio_Name" xml:space="preserve">
+    <value>Nombre</value>
+  </data>
+  <data name="Radio_NotFound" xml:space="preserve">
+    <value>¡No estaciones encontradas!</value>
+  </data>
+  <data name="Radio_Reset" xml:space="preserve">
+    <value>Reinicializar</value>
+  </data>
+  <data name="Radio_Search" xml:space="preserve">
+    <value>Búsqueda</value>
+  </data>
+  <data name="Radio_SearchStation" xml:space="preserve">
+    <value>Buscar estación</value>
+  </data>
+  <data name="Radio_Tags" xml:space="preserve">
+    <value>Tags</value>
+  </data>
+  <data name="Settings" xml:space="preserve">
+    <value>Ajustes</value>
+  </data>
+  <data name="Settings_About" xml:space="preserve">
+    <value>Acerca de</value>
+  </data>
+  <data name="Settings_AboutInfo" xml:space="preserve">
+    <value>unison es un software libre. Es construido con las siguientes tecnologías:</value>
+  </data>
+  <data name="Settings_ConnectButton" xml:space="preserve">
+    <value>Conexión</value>
+  </data>
+  <data name="Settings_Connection" xml:space="preserve">
+    <value>Conexión</value>
+  </data>
+  <data name="Settings_ConnectionPasswordInfo" xml:space="preserve">
+    <value>Tenga en cuenta que, dado que las contraseñas de MPD no son seguras (se envían en texto sin formato al servidor), se guardan tal cual en el archivo de configuración.</value>
+  </data>
+  <data name="Settings_ConnectionStatus" xml:space="preserve">
+    <value>Estado:</value>
+  </data>
+  <data name="Settings_ConnectionStatusConnected" xml:space="preserve">
+    <value>conectado a MPD</value>
+  </data>
+  <data name="Settings_ConnectionStatusConnecting" xml:space="preserve">
+    <value>conectando...</value>
+  </data>
+  <data name="Settings_ConnectionStatusOffline" xml:space="preserve">
+    <value>no conectado.</value>
+  </data>
+  <data name="Settings_Host" xml:space="preserve">
+    <value>Host</value>
+  </data>
+  <data name="Settings_License" xml:space="preserve">
+    <value>Licencia</value>
+  </data>
+  <data name="Settings_MadeBy" xml:space="preserve">
+    <value>Creado por</value>
+  </data>
+  <data name="Settings_NextTrack" xml:space="preserve">
+    <value>Pista siguiente</value>
+  </data>
+  <data name="Settings_Password" xml:space="preserve">
+    <value>Contraseña</value>
+  </data>
+  <data name="Settings_PlayPause" xml:space="preserve">
+    <value>Jugar / pausa</value>
+  </data>
+  <data name="Settings_Port" xml:space="preserve">
+    <value>Puerto</value>
+  </data>
+  <data name="Settings_PreviousTrack" xml:space="preserve">
+    <value>Pista precedente</value>
+  </data>
+  <data name="Settings_Shortcuts" xml:space="preserve">
+    <value>Atajos</value>
+  </data>
+  <data name="Settings_ShortcutsInfo" xml:space="preserve">
+    <value>Tenga en cuenta que si no está reconocida la tecla, esto se debe a una limitación en el funcionamiento de las teclas virtuales.</value>
+  </data>
+  <data name="Settings_ShortcutsKey" xml:space="preserve">
+    <value>Entre una tecla...</value>
+  </data>
+  <data name="Settings_ShowWindow" xml:space="preserve">
+    <value>Mostrar ventana</value>
+  </data>
+  <data name="Settings_SnapcastInfo1" xml:space="preserve">
+    <value>Puede cambiar a su propia versión instalada localmente del cliente Snapcast con una ruta</value>
+  </data>
+  <data name="Settings_SnapcastInfo2" xml:space="preserve">
+    <value> absoluta</value>
+  </data>
+  <data name="Settings_SnapcastInfo3" xml:space="preserve">
+    <value>.</value>
+  </data>
+  <data name="Settings_SnapcastLauch" xml:space="preserve">
+    <value>Lanzar al inicio</value>
+  </data>
+  <data name="Settings_SnapcastPath" xml:space="preserve">
+    <value>Ruta del ejecutable</value>
+  </data>
+  <data name="Settings_SnapcastPort" xml:space="preserve">
+    <value>Puerto</value>
+  </data>
+  <data name="Settings_SnapcastResetButton" xml:space="preserve">
+    <value>Reinicializar</value>
+  </data>
+  <data name="Settings_SnapcastWindow" xml:space="preserve">
+    <value>Mostrar ventana de Snapcast</value>
+  </data>
+  <data name="Settings_SourceCode1" xml:space="preserve">
+    <value>Código fuente disponible gratuitamente</value>
+  </data>
+  <data name="Settings_SourceCode2" xml:space="preserve">
+    <value>aquí</value>
+  </data>
+  <data name="Settings_Version" xml:space="preserve">
+    <value>Versión:</value>
+  </data>
+  <data name="Settings_VolumeDown" xml:space="preserve">
+    <value>Bajar volumen</value>
+  </data>
+  <data name="Settings_VolumeMute" xml:space="preserve">
+    <value>Volumen mudo</value>
+  </data>
+  <data name="Settings_VolumeOffset" xml:space="preserve">
+    <value>Intervalo de volumen</value>
+  </data>
+  <data name="Settings_VolumeUp" xml:space="preserve">
+    <value>Subir volumen</value>
+  </data>
+  <data name="ShowWindow" xml:space="preserve">
+    <value>Mostrar ventana</value>
+  </data>
+  <data name="Snapcast_Popup1" xml:space="preserve">
+    <value>Error Snapcast</value>
+  </data>
+  <data name="Snapcast_Popup2" xml:space="preserve">
+    <value>Ruta no válida:</value>
+  </data>
+  <data name="Snapcast_Popup3" xml:space="preserve">
+    <value>Ruta actual:</value>
+  </data>
+  <data name="Snapcast_Popup4" xml:space="preserve">
+    <value>Puede restablecerlo en la configuración si es necesario.</value>
+  </data>
+  <data name="StartSnapcast" xml:space="preserve">
+    <value>Iniciar Snapcast</value>
+  </data>
+  <data name="Stats" xml:space="preserve">
+    <value>Estadísticas</value>
+  </data>
+  <data name="Stats_Albums" xml:space="preserve">
+    <value>Álbumes:</value>
+  </data>
+  <data name="Stats_Artists" xml:space="preserve">
+    <value>Artistas:</value>
+  </data>
+  <data name="Stats_LastDatabaseUpdate" xml:space="preserve">
+    <value>Última actualización de la base de datos:</value>
+  </data>
+  <data name="Stats_Songs" xml:space="preserve">
+    <value>Canciones:</value>
+  </data>
+  <data name="Stats_TotalPlaytime" xml:space="preserve">
+    <value>Tiempo de juego total:</value>
+  </data>
+  <data name="Stats_TotalTimePlayed" xml:space="preserve">
+    <value>Tiempo total jugado:</value>
+  </data>
+  <data name="Stats_Uptime" xml:space="preserve">
+    <value>Tiempo de actividad de MPD:</value>
+  </data>
+  <data name="StopSnapcast" xml:space="preserve">
+    <value>Parar Snapcast</value>
+  </data>
+</root>

Resources/Resources.fr-FR.resx

@@ -133,7 +133,7 @@
     <value>Nom</value>
   </data>
   <data name="Radio_NotFound" xml:space="preserve">
-    <value>Aucun station trouvée !</value>
+    <value>Aucune station trouvée !</value>
   </data>
   <data name="Radio_Reset" xml:space="preserve">
     <value>Réinitialiser</value>
@@ -162,14 +162,20 @@
   <data name="Settings_Connection" xml:space="preserve">
     <value>Connexion</value>
   </data>
+  <data name="Settings_ConnectionPasswordInfo" xml:space="preserve">
+    <value>Veuillez noter que comme les mots de passe de MPD ne sont pas sécurisés (ils sont envoyés en clair au serveur), ils sont sauvegardés tels quels.</value>
+  </data>
+  <data name="Settings_ConnectionStatus" xml:space="preserve">
+    <value>Statut :</value>
+  </data>
   <data name="Settings_ConnectionStatusConnected" xml:space="preserve">
-    <value>Connecté à MPD</value>
+    <value>connecté à MPD</value>
   </data>
   <data name="Settings_ConnectionStatusConnecting" xml:space="preserve">
-    <value>Connexion en cours...</value>
+    <value>connexion en cours...</value>
   </data>
   <data name="Settings_ConnectionStatusOffline" xml:space="preserve">
-    <value>Non connecté.</value>
+    <value>non connecté.</value>
   </data>
   <data name="Settings_Host" xml:space="preserve">
     <value>Hôte</value>
@@ -180,12 +186,12 @@
   <data name="Settings_MadeBy" xml:space="preserve">
     <value>Créé par</value>
   </data>
-  <data name="Settings_MpcNET" xml:space="preserve">
-    <value> et sa version de MpcNET</value>
-  </data>
   <data name="Settings_NextTrack" xml:space="preserve">
     <value>Piste suivante</value>
   </data>
+  <data name="Settings_Password" xml:space="preserve">
+    <value>Mot de passe</value>
+  </data>
   <data name="Settings_PlayPause" xml:space="preserve">
     <value>Jouer / pause</value>
   </data>
@@ -198,6 +204,12 @@
   <data name="Settings_Shortcuts" xml:space="preserve">
     <value>Raccourcis</value>
   </data>
+  <data name="Settings_ShortcutsInfo" xml:space="preserve">
+    <value>Veuillez noter que si votre touche n'est pas reconnue, cela est du à la manière dont les touches virtuelles sont gérées par Windows.</value>
+  </data>
+  <data name="Settings_ShortcutsKey" xml:space="preserve">
+    <value>Appuyez sur une touche...</value>
+  </data>
   <data name="Settings_ShowWindow" xml:space="preserve">
     <value>Afficher la fenêtre</value>
   </data>
@@ -264,6 +276,30 @@
   <data name="StartSnapcast" xml:space="preserve">
     <value>Démarrer Snapcast</value>
   </data>
+  <data name="Stats" xml:space="preserve">
+    <value>Stats</value>
+  </data>
+  <data name="Stats_Albums" xml:space="preserve">
+    <value>Albums :</value>
+  </data>
+  <data name="Stats_Artists" xml:space="preserve">
+    <value>Artistes :</value>
+  </data>
+  <data name="Stats_LastDatabaseUpdate" xml:space="preserve">
+    <value>Mise à jour de la base de données :</value>
+  </data>
+  <data name="Stats_Songs" xml:space="preserve">
+    <value>Morceaux :</value>
+  </data>
+  <data name="Stats_TotalPlaytime" xml:space="preserve">
+    <value>Temps total :</value>
+  </data>
+  <data name="Stats_TotalTimePlayed" xml:space="preserve">
+    <value>Temps d'écoute écoulé :</value>
+  </data>
+  <data name="Stats_Uptime" xml:space="preserve">
+    <value>MPD lancé depuis : </value>
+  </data>
   <data name="StopSnapcast" xml:space="preserve">
     <value>Stopper Snapcast</value>
   </data>

Resources/Resources.resx

@@ -162,14 +162,20 @@
   <data name="Settings_Connection" xml:space="preserve">
     <value>Connection</value>
   </data>
+  <data name="Settings_ConnectionPasswordInfo" xml:space="preserve">
+    <value>Please note that since MPD passwords are not secure (they are sent in plain text to the server), there are saved as is in the setting file.</value>
+  </data>
+  <data name="Settings_ConnectionStatus" xml:space="preserve">
+    <value>Status:</value>
+  </data>
   <data name="Settings_ConnectionStatusConnected" xml:space="preserve">
-    <value>Connected to MPD</value>
+    <value>connected to MPD</value>
   </data>
   <data name="Settings_ConnectionStatusConnecting" xml:space="preserve">
-    <value>Connecting...</value>
+    <value>connecting...</value>
   </data>
   <data name="Settings_ConnectionStatusOffline" xml:space="preserve">
-    <value>Not connected.</value>
+    <value>not connected.</value>
   </data>
   <data name="Settings_Host" xml:space="preserve">
     <value>Host</value>
@@ -180,12 +186,12 @@
   <data name="Settings_MadeBy" xml:space="preserve">
     <value>Made by</value>
   </data>
-  <data name="Settings_MpcNET" xml:space="preserve">
-    <value>'s updated MpcNET</value>
-  </data>
   <data name="Settings_NextTrack" xml:space="preserve">
     <value>Next track</value>
   </data>
+  <data name="Settings_Password" xml:space="preserve">
+    <value>Password</value>
+  </data>
   <data name="Settings_PlayPause" xml:space="preserve">
     <value>Play / pause</value>
   </data>
@@ -198,6 +204,12 @@
   <data name="Settings_Shortcuts" xml:space="preserve">
     <value>Shortcuts</value>
   </data>
+  <data name="Settings_ShortcutsInfo" xml:space="preserve">
+    <value>Please note that if the input key is not recognized, this is due to a limitation on how virtual keys work.</value>
+  </data>
+  <data name="Settings_ShortcutsKey" xml:space="preserve">
+    <value>Enter a key...</value>
+  </data>
   <data name="Settings_ShowWindow" xml:space="preserve">
     <value>Show window</value>
   </data>
@@ -264,6 +276,30 @@
   <data name="StartSnapcast" xml:space="preserve">
     <value>Start Snapcast</value>
   </data>
+  <data name="Stats" xml:space="preserve">
+    <value>Stats</value>
+  </data>
+  <data name="Stats_Albums" xml:space="preserve">
+    <value>Albums:</value>
+  </data>
+  <data name="Stats_Artists" xml:space="preserve">
+    <value>Artists:</value>
+  </data>
+  <data name="Stats_LastDatabaseUpdate" xml:space="preserve">
+    <value>Last database update:</value>
+  </data>
+  <data name="Stats_Songs" xml:space="preserve">
+    <value>Songs:</value>
+  </data>
+  <data name="Stats_TotalPlaytime" xml:space="preserve">
+    <value>Total playtime:</value>
+  </data>
+  <data name="Stats_TotalTimePlayed" xml:space="preserve">
+    <value>Total time played:</value>
+  </data>
+  <data name="Stats_Uptime" xml:space="preserve">
+    <value>MPD uptime:</value>
+  </data>
   <data name="StopSnapcast" xml:space="preserve">
     <value>Stop Snapcast</value>
   </data>

Resources/Resources.xaml

@@ -1,15 +1,28 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+                    xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:sys="clr-namespace:System;assembly=System.Runtime">
 
-    <system:String x:Key="snapcastPath">snapclient_0.25.0-1_win64</system:String>
+    <system:String x:Key="snapcastPath">snapclient_0.26.0-1_win64</system:String>
     <system:String x:Key="snapcastPort">1704</system:String>
 
-    <system:String x:Key="connectionOk1">&#xf385;</system:String>
-    <system:String x:Key="connectionOk2">&#xf386;</system:String>
-    <system:String x:Key="connectionFail">&#xf384;</system:String>
-
     <system:String x:Key="playButton">&#xedb4;</system:String>
     <system:String x:Key="pauseButton">&#xedb5;</system:String>
 
+    <system:String x:Key="volume_offset">5</system:String>
+    
+    <system:UInt32 x:Key="nextTrack_mod">2</system:UInt32>
+    <system:UInt32 x:Key="nextTrack_vk">176</system:UInt32>
+    <system:UInt32 x:Key="previousTrack_mod">2</system:UInt32>
+    <system:UInt32 x:Key="previousTrack_vk">177</system:UInt32>
+    <system:UInt32 x:Key="playPause_mod">2</system:UInt32>
+    <system:UInt32 x:Key="playPause_vk">179</system:UInt32>
+    <system:UInt32 x:Key="volumeUp_mod">2</system:UInt32>
+    <system:UInt32 x:Key="volumeUp_vk">175</system:UInt32>
+    <system:UInt32 x:Key="volumeDown_mod">2</system:UInt32>
+    <system:UInt32 x:Key="volumeDown_vk">174</system:UInt32>
+    <system:UInt32 x:Key="volumeMute_mod">2</system:UInt32>
+    <system:UInt32 x:Key="volumeMute_vk">173</system:UInt32>
+    <system:UInt32 x:Key="showWindow_mod">3</system:UInt32>
+    <system:UInt32 x:Key="showWindow_vk">13</system:UInt32>
+
 </ResourceDictionary>

Views/MainWindow.xaml

@@ -104,7 +104,8 @@
                             <VisualBrush Visual="{Binding ElementName=mask}"/>
                         </StackPanel.OpacityMask>
                         <Image x:Name="Cover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/nocover.png" Visibility="Collapsed" />
-                        <Image x:Name="NoCover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/nocover.png" />
+                        <Image x:Name="NoCover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/nocover.png" Visibility="Collapsed" />
+                        <Image x:Name="RadioCover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/radio.png" Visibility="Collapsed" />
                     </StackPanel>
                 </Grid>
             </Border>
@@ -117,7 +118,7 @@
                         <TextBlock x:Name="SnapcastText" Text="{x:Static properties:Resources.StartSnapcast}" Margin="5, 0, 0, 0"/>
                     </StackPanel>
                 </Button>
-                <Button x:Name="Radio" Padding="5, 2" HorizontalAlignment="Left" Click="Radios_Clicked"  Margin="5,0,10,0" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}">
+                <Button x:Name="Radio" Padding="5, 2" HorizontalAlignment="Left" Click="Radios_Clicked"  Margin="5,0,10,0" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" FocusVisualStyle="{x:Null}" IsEnabled="False">
                     <StackPanel Orientation="Horizontal">
                         <emoji:TextBlock Text="📻" Padding="0,0,0,2"/>
                         <TextBlock Text="{x:Static properties:Resources.Radios}" Margin="5, 0, 0, 0"/>

Views/MainWindow.xaml.cs

@@ -46,9 +46,12 @@ namespace unison
         {
             if (_mpd.IsConnected())
             {
-                Snapcast.IsEnabled = true;
                 ConnectionOkIcon.Visibility = Visibility.Visible;
                 ConnectionFailIcon.Visibility = Visibility.Collapsed;
+
+                Snapcast.IsEnabled = true;
+                if (_radiosWin.IsConnected())
+                    Radio.IsEnabled = true;
             }
             else
             {
@@ -56,6 +59,9 @@ namespace unison
                 DefaultState(true);
                 ConnectionOkIcon.Visibility = Visibility.Collapsed;
                 ConnectionFailIcon.Visibility = Visibility.Visible;
+
+                Snapcast.IsEnabled = false;
+                Radio.IsEnabled = false;
             }
             _settingsWin.UpdateConnectionStatus();
             Connection.Text = $"{Properties.Settings.Default.mpd_host}:{Properties.Settings.Default.mpd_port}";
@@ -83,7 +89,7 @@ namespace unison
             SongAlbum.Text = _mpd.GetCurrentSong().Album;
 
             if (_mpd.GetCurrentSong().Date != null)
-                SongAlbum.Text += $" ({ _mpd.GetCurrentSong().Date})";
+                SongAlbum.Text += $" ({_mpd.GetCurrentSong().Date.Split("-")[0]})";
 
             SongGenre.Text = _mpd.GetCurrentSong().Genre;
             SongFormat.Text = _mpd.GetCurrentSong().Path.Substring(_mpd.GetCurrentSong().Path.LastIndexOf(".") + 1);
@@ -135,6 +141,9 @@ namespace unison
                     DefaultState();
                 }
             }
+
+            _mpd.QueryStats();
+            _settingsWin.UpdateStats();
         }
 
         private void DefaultState(bool LostConnection = false)
@@ -150,8 +159,9 @@ namespace unison
             PlayPause.Text = (string)Application.Current.FindResource("pauseButton");
             TimeSlider.Value = 50;
             TimeSlider.IsEnabled = false;
-            NoCover.Visibility = Visibility.Visible;
+            NoCover.Visibility = Visibility.Collapsed;
             Cover.Visibility = Visibility.Collapsed;
+            RadioCover.Visibility = Visibility.Collapsed;
 
             if (LostConnection)
             {
@@ -163,16 +173,18 @@ namespace unison
 
         public void OnCoverChanged(object sender, EventArgs e)
         {
-            if (_mpd.GetCover() == null)
+            NoCover.Visibility = Visibility.Collapsed;
-            {
+            Cover.Visibility = Visibility.Collapsed;
+            RadioCover.Visibility = Visibility.Collapsed;
+
+            if (_mpd.GetCurrentSong().Time == -1)
+                RadioCover.Visibility = Visibility.Visible;
+            else if (_mpd.GetCover() == null)
                 NoCover.Visibility = Visibility.Visible;
-                Cover.Visibility = Visibility.Collapsed;
-            }
             else if (Cover.Source != _mpd.GetCover())
             {
                 Cover.Source = _mpd.GetCover();
                 Cover.Visibility = Visibility.Visible;
-                NoCover.Visibility = Visibility.Collapsed;
             }
         }
 

Views/Radios.xaml.cs

@@ -54,27 +54,48 @@ namespace unison
     {
         private RadioBrowserClient _radioBrowser;
         private MPDHandler _mpd;
+        private bool _connected = true;
+
+        public bool IsConnected() => _connected;
 
         public Radios()
         {
             InitializeComponent();
 
-            _radioBrowser = new RadioBrowserClient();
+            try
-            Initialize();
+            {
+                _radioBrowser = new RadioBrowserClient();
+                Initialize();
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine("Exception while connecting to RadioBrowser: " + e.Message);
+                return;
+            }
+
+            _connected = true;
         }
 
         public async void Initialize()
         {
-            List<NameAndCount> Countries = await _radioBrowser.Lists.GetCountriesAsync();
+            try
-            CountryList.Items.Add(new CountryListItem { Name = "", Count = 0 });
-            
-            foreach (NameAndCount Country in Countries)
             {
-                CountryList.Items.Add(new CountryListItem
+                List<NameAndCount> Countries = await _radioBrowser.Lists.GetCountriesAsync();
+                CountryList.Items.Add(new CountryListItem { Name = "", Count = 0 });
+
+                foreach (NameAndCount Country in Countries)
                 {
-                    Name = Country.Name,
+                    CountryList.Items.Add(new CountryListItem
-                    Count = Country.Stationcount
+                    {
-                });
+                        Name = Country.Name,
+                        Count = Country.Stationcount
+                    });
+                }
+            }
+            catch (Exception e)
+            {
+                Debug.WriteLine("Exception while getting countries in RadioBrowser: " + e.Message);
+                return;
             }
         }
 
@@ -85,35 +106,42 @@ namespace unison
 
         public async Task SearchAdvanced(string name, string country, string tags)
         {
-            SearchStatus.Text = unison.Resources.Resources.Radio_Loading;
+            try
-
-            List<StationInfo> advancedSearch = await _radioBrowser.Search.AdvancedAsync(new AdvancedSearchOptions
             {
-                Name = name,
+                SearchStatus.Text = unison.Resources.Resources.Radio_Loading;
-                Country = country,
-                TagList = tags
-            });
 
-            RadioListGrid.Items.Clear();
+                List<StationInfo> advancedSearch = await _radioBrowser.Search.AdvancedAsync(new AdvancedSearchOptions
-            if (advancedSearch.Count > 0)
-            {
-                SearchStatus.Text = "";
-                foreach (StationInfo station in advancedSearch)
                 {
-                    RadioListGrid.Items.Add(new StationListItem
+                    Name = name,
+                    Country = country,
+                    TagList = tags
+                });
+
+                RadioListGrid.Items.Clear();
+                if (advancedSearch.Count > 0)
+                {
+                    SearchStatus.Text = "";
+                    foreach (StationInfo station in advancedSearch)
                     {
-                        Name = CleanString(station.Name),
+                        RadioListGrid.Items.Add(new StationListItem
-                        Country = station.CountryCode,
+                        {
-                        Codec = station.Codec,
+                            Name = CleanString(station.Name),
-                        Bitrate = station.Bitrate,
+                            Country = station.CountryCode,
-                        Url = station.Url,
+                            Codec = station.Codec,
-                        Tags = string.Join(", ", station.Tags)
+                            Bitrate = station.Bitrate,
-                    });
+                            Url = station.Url,
+                            Tags = string.Join(", ", station.Tags)
+                        });
+                    }
+                    FitToContent();
                 }
-                FitToContent();
+                else
+                    SearchStatus.Text = unison.Resources.Resources.Radio_NotFound;
+            }
+            catch (Exception except)
+            {
+                Debug.WriteLine("Error on RadioBrowser search advanced: " + except.Message);
             }
-            else
-                SearchStatus.Text = unison.Resources.Resources.Radio_NotFound;
         }
 
         private void FitToContent()
@@ -148,8 +176,15 @@ namespace unison
 
         private async void Search_Clicked(object sender, RoutedEventArgs e)
         {
-            CountryListItem a = (CountryListItem)CountryList.SelectedItem;
+            try
-            await SearchAdvanced(NameSearch.Text, a?.Name, TagSearch.Text);
+            {
+                CountryListItem a = (CountryListItem)CountryList.SelectedItem;
+                await SearchAdvanced(NameSearch.Text, a?.Name, TagSearch.Text);
+            }
+            catch (Exception except)
+            {
+                Debug.WriteLine("Error on RadioBrowser search: " + except.Message);
+            }
         }
 
         private void Reset_Clicked(object sender, RoutedEventArgs e)

Views/Settings.xaml

@@ -4,9 +4,19 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:emoji="clr-namespace:Emoji.Wpf;assembly=Emoji.Wpf"
-        xmlns:properties="clr-namespace:unison.Resources" 
+        xmlns:properties="clr-namespace:unison.Resources" xmlns:sys="clr-namespace:System;assembly=System.Runtime"
         mc:Ignorable="d"
         Closing="Window_Closing" Title="{x:Static properties:Resources.Settings}" ResizeMode="CanMinimize" Icon="/Resources/icon-full.ico" WindowStyle="ToolWindow" SizeToContent="WidthAndHeight">
+
+    <Window.Resources>
+        <x:Array x:Key="ShortcutItems" Type="sys:String">
+            <sys:String>None</sys:String>
+            <sys:String>Alt</sys:String>
+            <sys:String>Control</sys:String>
+            <sys:String>Shift</sys:String>
+        </x:Array>
+    </Window.Resources>
+
     <Grid>
         <StackPanel Orientation="Vertical">
             <TabControl Margin="10">
@@ -14,31 +24,34 @@
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
-                                <StackPanel Orientation="Horizontal">
+                                <TextBlock>
-                                    <TextBlock>
+                                    <emoji:EmojiInline Text="📶"/>
-                                        <emoji:EmojiInline Text="📶"/>
+                                    <Run Text="{x:Static properties:Resources.Settings_Connection}"/>
-                                        <Run Text="{x:Static properties:Resources.Settings_Connection}"/>
+                                </TextBlock>
-                                    </TextBlock>
-                                </StackPanel>
                             </GroupBox.Header>
                             <Grid VerticalAlignment="Top">
                                 <StackPanel>
                                     <StackPanel>
                                         <TextBlock Text="{x:Static properties:Resources.Settings_Host}" TextWrapping="Wrap" Margin="5,0,0,0"/>
-                                        <TextBox x:Name="MpdHost" KeyDown="ConnectHandler" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
+                                        <TextBox x:Name="MpdHost" KeyDown="ConnectHandler" TextChanged="MpdConnectTextBox" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
                                     </StackPanel>
 
                                     <StackPanel Margin="0,5,0,0">
                                         <TextBlock Text="{x:Static properties:Resources.Settings_Port}" TextWrapping="Wrap" Margin="5,0,0,0"/>
-                                        <TextBox x:Name="MpdPort" KeyDown="ConnectHandler" MaxLength="5" PreviewTextInput="NumberValidationTextBox" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
+                                        <TextBox x:Name="MpdPort" KeyDown="ConnectHandler" PreviewTextInput="NumberValidationTextBox" MaxLength="5" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
                                     </StackPanel>
 
-                                    <!--<StackPanel Margin="0,5,0,0">
+                                    <StackPanel Margin="0,5,0,0">
-                                        <TextBlock Text="Password" TextWrapping="Wrap" Margin="5,0,0,0"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_Password}" TextWrapping="Wrap" Margin="5,0,0,0"/>
-                                        <TextBox x:Name="MpdPassword" TextWrapping="Wrap" Width="250" Margin="10,2,0,0"/>
+                                        <PasswordBox x:Name="MpdPassword" KeyDown="ConnectHandler" Width="250" Margin="10,2,0,0"/>
-                                    </StackPanel>-->
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_ConnectionPasswordInfo}" TextWrapping="Wrap" Margin="10,5,0,0" MaxWidth="250" HorizontalAlignment="Left"/>
+                                    </StackPanel>
+
+                                    <TextBlock TextWrapping="Wrap" Margin="5,10,0,0">
+                                        <Run Text="{x:Static properties:Resources.Settings_ConnectionStatus}" FontWeight="Bold" />
+                                        <Run x:Name="ConnectionStatus" Text="{x:Static properties:Resources.Settings_ConnectionStatusOffline}"/>
+                                    </TextBlock>
 
-                                    <TextBlock x:Name="ConnectionStatus" Text="{x:Static properties:Resources.Settings_ConnectionStatusOffline}" TextWrapping="Wrap" Margin="5,10,0,0"/>
                                     <Button x:Name="ConnectButton" Content="{x:Static properties:Resources.Settings_ConnectButton}" Margin="0,10,0,0" Width="120" Click="MPDConnect_Clicked"/>
                                 </StackPanel>
                             </Grid>
@@ -50,9 +63,7 @@
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
-                                <StackPanel Orientation="Horizontal">
+                                <emoji:TextBlock Text="🔊 Snapcast"/>
-                                    <emoji:TextBlock Text="🔊 Snapcast"/>
-                                </StackPanel>
                             </GroupBox.Header>
                             <Grid VerticalAlignment="Top">
                                 <StackPanel>
@@ -82,20 +93,19 @@
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
                             <GroupBox.Header>
-                                <StackPanel Orientation="Horizontal">
+                                <TextBlock>
-                                    <TextBlock>
+                                    <emoji:EmojiInline Text="⌨️ "/>
-                                        <emoji:EmojiInline Text="⌨️ "/>
+                                    <Run Text="{x:Static properties:Resources.Settings_Shortcuts}"></Run>
-                                        <Run Text="{x:Static properties:Resources.Settings_Shortcuts}"></Run>
+                                </TextBlock>
-                                    </TextBlock>
-                                </StackPanel>
                             </GroupBox.Header>
                             <Grid>
                                 <StackPanel>
-                                    <StackPanel Orientation="Horizontal">
+                                    <StackPanel Orientation="Horizontal" Margin="0,0,0,5">
-                                        <TextBlock Text="{x:Static properties:Resources.Settings_VolumeOffset}" TextWrapping="Wrap"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_VolumeOffset}" TextWrapping="Wrap" Margin="0,2,0,0"/>
                                         <TextBox x:Name="VolumeOffset" TextWrapping="Wrap" Width="25" PreviewTextInput="NumberValidationTextBox" Margin="8,2,0,0"/>
                                     </StackPanel>
-                                    <Grid MinWidth="300" Margin="0,5,0,0">
+
+                                    <Grid Margin="0,5,0,0" x:Name="RebindKeyWrapper">
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition/>
                                             <ColumnDefinition/>
@@ -108,29 +118,109 @@
                                             <RowDefinition/>
                                             <RowDefinition/>
                                             <RowDefinition/>
+                                            <RowDefinition/>
                                         </Grid.RowDefinitions>
-                                        <TextBlock Text="{x:Static properties:Resources.Settings_NextTrack}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="0" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_NextTrack}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="0" Margin="1,1,1,1" Grid.RowSpan="2"/>
-                                        <TextBlock Text="{x:Static properties:Resources.Settings_PreviousTrack}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="1" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_PreviousTrack}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="2" Margin="1,1,1,1"/>
-                                        <TextBlock Text="{x:Static properties:Resources.Settings_PlayPause}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="2" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_PlayPause}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="3" Margin="1,1,1,1"/>
-                                        <TextBlock Text="{x:Static properties:Resources.Settings_VolumeUp}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="3" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_VolumeUp}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="4" Margin="1,1,1,1"/>
-                                        <TextBlock Text="{x:Static properties:Resources.Settings_VolumeDown}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="4" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_VolumeDown}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="5" Margin="1,1,1,1"/>
-                                        <TextBlock Text="{x:Static properties:Resources.Settings_VolumeMute}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="5" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_VolumeMute}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="6" Margin="1,1,1,1"/>
-                                        <TextBlock Text="{x:Static properties:Resources.Settings_ShowWindow}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="6" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_ShowWindow}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="7" Margin="1,1,1,1"/>
 
-                                        <TextBlock Text="ctrl + media_next" TextWrapping="Wrap" Grid.Column="1" Grid.Row="0" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
+                                        <StackPanel x:Name="Shortcut_NextTrack" Orientation="Horizontal" Grid.Column="1" Grid.Row="0" Margin="10,0,0,2" Grid.RowSpan="2">
-                                        <TextBlock Text="ctrl + media_prev" TextWrapping="Wrap" Grid.Column="1" Grid.Row="1" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD1" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
-                                        <TextBlock Text="ctrl + media_play" TextWrapping="Wrap" Grid.Column="1" Grid.Row="2" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD2" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
-                                        <TextBlock Text="ctrl + volume_up" TextWrapping="Wrap" Grid.Column="1" Grid.Row="3" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
+                                            <Button Click="RemapKey_Clicked" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" FocusVisualStyle="{x:Null}">
-                                        <TextBlock Text="ctrl + volume_down" TextWrapping="Wrap" Grid.Column="1" Grid.Row="4" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
+                                                <TextBlock Text="None" TextAlignment="Center" TextWrapping="Wrap"  MinWidth="150" Margin="5,1,5,1" HorizontalAlignment="Stretch" FontWeight="Light" VerticalAlignment="Stretch"/>
-                                        <TextBlock Text="ctrl + volume_mute" TextWrapping="Wrap" Grid.Column="1" Grid.Row="5" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
+                                            </Button>
-                                        <TextBlock Text="ctrl + alt + enter" TextWrapping="Wrap" Grid.Column="1" Grid.Row="6" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
+                                        </StackPanel>
+
+                                        <StackPanel x:Name="Shortcut_PreviousTrack" Orientation="Horizontal" Grid.Column="1" Grid.Row="2" Margin="10,0,0,2">
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD1" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD2" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <Button Click="RemapKey_Clicked" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" FocusVisualStyle="{x:Null}">
+                                                <TextBlock Text="None" TextAlignment="Center" TextWrapping="Wrap"  MinWidth="150" Margin="5,1,5,1" HorizontalAlignment="Stretch" FontWeight="Light" VerticalAlignment="Stretch"/>
+                                            </Button>
+                                        </StackPanel>
+
+                                        <StackPanel x:Name="Shortcut_PlayPause" Orientation="Horizontal" Grid.Column="1" Grid.Row="3" Margin="10,0,0,2">
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD1" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD2" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <Button Click="RemapKey_Clicked" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" FocusVisualStyle="{x:Null}">
+                                                <TextBlock Text="None" TextAlignment="Center" TextWrapping="Wrap"  MinWidth="150" Margin="5,1,5,1" HorizontalAlignment="Stretch" FontWeight="Light" VerticalAlignment="Stretch"/>
+                                            </Button>
+                                        </StackPanel>
+
+                                        <StackPanel x:Name="Shortcut_VolumeUp" Orientation="Horizontal" Grid.Column="1" Grid.Row="4" Margin="10,0,0,2">
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD1" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD2" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <Button Click="RemapKey_Clicked" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" FocusVisualStyle="{x:Null}">
+                                                <TextBlock Text="None" TextAlignment="Center" TextWrapping="Wrap"  MinWidth="150" Margin="5,1,5,1" HorizontalAlignment="Stretch" FontWeight="Light" VerticalAlignment="Stretch"/>
+                                            </Button>
+                                        </StackPanel>
+
+                                        <StackPanel x:Name="Shortcut_VolumeDown" Orientation="Horizontal" Grid.Column="1" Grid.Row="5" Margin="10,0,0,2">
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD1" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD2" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <Button Click="RemapKey_Clicked" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" FocusVisualStyle="{x:Null}">
+                                                <TextBlock Text="None" TextAlignment="Center" TextWrapping="Wrap"  MinWidth="150" Margin="5,1,5,1" HorizontalAlignment="Stretch" FontWeight="Light" VerticalAlignment="Stretch"/>
+                                            </Button>
+                                        </StackPanel>
+
+                                        <StackPanel x:Name="Shortcut_VolumeMute" Orientation="Horizontal" Grid.Column="1" Grid.Row="6" Margin="10,0,0,2">
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD1" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD2" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <Button Click="RemapKey_Clicked" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" FocusVisualStyle="{x:Null}">
+                                                <TextBlock Text="None" TextAlignment="Center" TextWrapping="Wrap"  MinWidth="150" Margin="5,1,5,1" HorizontalAlignment="Stretch" FontWeight="Light" VerticalAlignment="Stretch"/>
+                                            </Button>
+                                        </StackPanel>
+
+                                        <StackPanel x:Name="Shortcut_ShowWindow" Orientation="Horizontal" Grid.Column="1" Grid.Row="7" Margin="10,0,0,0">
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD1" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <ComboBox ItemsSource="{StaticResource ShortcutItems}" Margin="0,0,5,0" MinWidth="70" SelectionChanged="MOD_SelectionChanged" Tag="MOD2" FontWeight="Light" SelectedIndex="0" BorderBrush="{x:Null}" FocusVisualStyle="{x:Null}"></ComboBox>
+                                            <Button Click="RemapKey_Clicked" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" FocusVisualStyle="{x:Null}">
+                                                <TextBlock Text="None" TextAlignment="Center" TextWrapping="Wrap"  MinWidth="150" Margin="5,1,5,1" HorizontalAlignment="Stretch" FontWeight="Light" VerticalAlignment="Stretch"/>
+                                            </Button>
+                                        </StackPanel>
                                     </Grid>
+
+                                    <StackPanel Orientation="Horizontal" Margin="0,10,0,0">
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_ShortcutsInfo}" TextWrapping="Wrap" MaxWidth="440" TextAlignment="Justify" />
+                                    </StackPanel>
+
+                                    <Button Content="{x:Static properties:Resources.Settings_SnapcastResetButton}" Margin="0,10,0,0" Width="120" Click="ShortcutsReset_Clicked"/>
+
                                 </StackPanel>
                             </Grid>
                         </GroupBox>
                     </DockPanel>
                 </TabItem>
 
+                <TabItem Header="{x:Static properties:Resources.Stats}">
+                    <DockPanel Margin="8">
+                        <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
+                            <GroupBox.Header>
+                                <TextBlock>
+                                    <emoji:EmojiInline Text="📊"/>
+                                    <Run Text="{x:Static properties:Resources.Stats}"/>
+                                </TextBlock>
+                            </GroupBox.Header>
+                            <Grid VerticalAlignment="Top">
+                                <TextBlock>
+                                    <Run Text="{x:Static properties:Resources.Stats_Songs}"/><Run Text=" "/><Run x:Name="StatSong"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_Albums}"/><Run Text=" "/><Run x:Name="StatAlbum"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_Artists}"/><Run Text=" "/><Run x:Name="StatArtist"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_TotalPlaytime}"/><Run Text=" "/><Run x:Name="StatTotalPlaytime"/><LineBreak/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_Uptime}"/><Run Text=" "/><Run x:Name="StatUptime"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_TotalTimePlayed}"/><Run Text=" "/><Run x:Name="StatTotalTimePlayed"/><LineBreak/>
+                                    <Run Text="{x:Static properties:Resources.Stats_LastDatabaseUpdate}"/><Run Text=" "/><Run x:Name="StatDatabaseUpdate"/>
+                                </TextBlock>
+                            </Grid>
+                        </GroupBox>
+                    </DockPanel>
+                </TabItem>
+
                 <TabItem Header="{x:Static properties:Resources.Settings_About}" Height="20" VerticalAlignment="Bottom">
                     <DockPanel Margin="8">
                         <GroupBox DockPanel.Dock="Top" Padding="0,4,0,0">
@@ -145,14 +235,14 @@
                                     </TextBlock>
                                     <TextBlock TextWrapping="Wrap" VerticalAlignment="Top">
                                         <Run Text="{x:Static properties:Resources.Settings_AboutInfo}" /><LineBreak/>
-                                        ※ <Hyperlink NavigateUri="https://github.com/Difegue/Stylophone" RequestNavigate="Hyperlink_RequestNavigate">Stylophone</Hyperlink><Run Text="{x:Static properties:Resources.Settings_MpcNET}" /><LineBreak/>
+                                        ※ <Hyperlink NavigateUri="https://github.com/Difegue/MpcNET" RequestNavigate="Hyperlink_RequestNavigate">MpcNET</Hyperlink><LineBreak/>
                                         ※ <Hyperlink NavigateUri="https://github.com/hardcodet/wpf-notifyicon" RequestNavigate="Hyperlink_RequestNavigate">wpf-notifyicon</Hyperlink><LineBreak/>
                                         ※ <Hyperlink NavigateUri="https://github.com/samhocevar/emoji.wpf" RequestNavigate="Hyperlink_RequestNavigate">Emoji.WPF</Hyperlink><LineBreak/>
                                          ※ <Hyperlink NavigateUri="https://github.com/tof4/RadioBrowser" RequestNavigate="Hyperlink_RequestNavigate">RadioBrowser</Hyperlink>
                                     </TextBlock>
                                     <TextBlock Margin="0,10,0,0">
                                         <Run Text="{x:Static properties:Resources.Settings_SourceCode1}" />
-                                        <Hyperlink NavigateUri="https://git.n700.ovh/keb/unison" RequestNavigate="Hyperlink_RequestNavigate">
+                                        <Hyperlink NavigateUri="https://github.com/ZetaKebab/unison" RequestNavigate="Hyperlink_RequestNavigate">
                                             <Run Text="{x:Static properties:Resources.Settings_SourceCode2}" />
                                         </Hyperlink>.
                                     </TextBlock>

Views/Settings.xaml.cs

@@ -2,9 +2,11 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Navigation;
@@ -33,6 +35,9 @@ namespace unison
             }
         }
 
+        HotkeyHandler _hotkeys = (HotkeyHandler)Application.Current.Properties["hotkeys"];
+
+
         public Settings()
         {
             InitHwnd();
@@ -41,14 +46,36 @@ namespace unison
 
             WindowState = WindowState.Minimized;
 
+            Initialize();
+        }
+
+        void Initialize()
+        {
             MpdHost.Text = Properties.Settings.Default.mpd_host;
             MpdPort.Text = Properties.Settings.Default.mpd_port.ToString();
-            //MpdPassword.Text = Properties.Settings.Default.mpd_password;
+            MpdPassword.Password = Properties.Settings.Default.mpd_password;
             SnapcastStartup.IsChecked = Properties.Settings.Default.snapcast_startup;
             SnapcastWindow.IsChecked = Properties.Settings.Default.snapcast_window;
             SnapcastPath.Text = Properties.Settings.Default.snapcast_path;
             SnapcastPort.Text = Properties.Settings.Default.snapcast_port.ToString();
             VolumeOffset.Text = Properties.Settings.Default.volume_offset.ToString();
+
+            InitializeShortcuts();
+        }
+
+        public void UpdateConnectionStatus()
+        {
+            MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
+            if (mpd.IsConnected())
+            {
+                ConnectionStatus.Text = $"{unison.Resources.Resources.Settings_ConnectionStatusConnected} {mpd.GetVersion()}.";
+                ConnectButton.IsEnabled = false;
+            }
+            else
+            {
+                ConnectionStatus.Text = unison.Resources.Resources.Settings_ConnectionStatusOffline;
+                ConnectButton.IsEnabled = true;
+            }
         }
 
         private void NumberValidationTextBox(object sender, TextCompositionEventArgs e)
@@ -57,6 +84,18 @@ namespace unison
             e.Handled = regex.IsMatch(e.Text);
         }
 
+        private void MpdConnectTextBox(object sender, TextChangedEventArgs e)
+        {
+            TextBox textBox = (TextBox)sender;
+
+            if (textBox.Text == Properties.Settings.Default.mpd_host)
+                ConnectButton.IsEnabled = false;
+            else
+                ConnectButton.IsEnabled = true;
+
+            e.Handled = true;
+        }
+
         private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
         {
             ProcessStartInfo psi = new(e.Uri.AbsoluteUri);
@@ -65,21 +104,18 @@ namespace unison
             e.Handled = true;
         }
 
-        public void UpdateConnectionStatus()
-        {
-            MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
-            if (mpd.IsConnected())
-                ConnectionStatus.Text = $"{unison.Resources.Resources.Settings_ConnectionStatusConnected} {mpd.GetVersion()}.";
-            else
-                ConnectionStatus.Text = unison.Resources.Resources.Settings_ConnectionStatusOffline;
-        }
-
         private void MPDConnect_Clicked(object sender, RoutedEventArgs e)
         {
+            if (!ConnectButton.IsEnabled)
+                return;
+
             SaveSettings();
+
+            ConnectButton.IsEnabled = false;
             ConnectionStatus.Text = unison.Resources.Resources.Settings_ConnectionStatusConnecting;
+
             MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
-            mpd.Connect();
+            System.Threading.Tasks.Task.Run(async () => { await mpd.Initialize(); });
         }
 
         private void SnapcastReset_Clicked(object sender, RoutedEventArgs e)
@@ -88,17 +124,16 @@ namespace unison
             SnapcastPort.Text = (string)Application.Current.FindResource("snapcastPort");
         }
 
-        public void SaveSettings()
+        public void UpdateStats()
         {
-            Properties.Settings.Default.mpd_host = MpdHost.Text;
+            MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
-            Properties.Settings.Default.mpd_port = int.Parse(MpdPort.Text, CultureInfo.InvariantCulture);
+            StatSong.Text = mpd.GetStats().Songs.ToString();
-            //Properties.Settings.Default.mpd_password = MpdPassword.Text;
+            StatAlbum.Text = mpd.GetStats().Albums.ToString();
-            Properties.Settings.Default.snapcast_startup = (bool)SnapcastStartup.IsChecked;
+            StatArtist.Text = mpd.GetStats().Artists.ToString();
-            Properties.Settings.Default.snapcast_window = (bool)SnapcastWindow.IsChecked;
+            StatTotalPlaytime.Text = mpd.GetStats().TotalPlaytime.ToString();
-            Properties.Settings.Default.snapcast_path = SnapcastPath.Text;
+            StatUptime.Text = mpd.GetStats().Uptime.ToString();
-            Properties.Settings.Default.snapcast_port = int.Parse(SnapcastPort.Text, CultureInfo.InvariantCulture);
+            StatTotalTimePlayed.Text = mpd.GetStats().TotalTimePlayed.ToString();
-            Properties.Settings.Default.volume_offset = int.Parse(VolumeOffset.Text, CultureInfo.InvariantCulture);
+            StatDatabaseUpdate.Text = mpd.GetStats().DatabaseUpdate.ToString();
-            Properties.Settings.Default.Save();
         }
 
         private void ConnectHandler(object sender, KeyEventArgs e)
@@ -120,5 +155,234 @@ namespace unison
             WindowInteropHelper helper = new(this);
             helper.EnsureHandle();
         }
+
+        public void SaveSettings()
+        {
+            Properties.Settings.Default.mpd_host = MpdHost.Text;
+            Properties.Settings.Default.mpd_port = int.Parse(MpdPort.Text, CultureInfo.InvariantCulture);
+            Properties.Settings.Default.mpd_password = MpdPassword.Password;
+            Properties.Settings.Default.snapcast_startup = (bool)SnapcastStartup.IsChecked;
+            Properties.Settings.Default.snapcast_window = (bool)SnapcastWindow.IsChecked;
+            Properties.Settings.Default.snapcast_path = SnapcastPath.Text;
+            Properties.Settings.Default.snapcast_port = int.Parse(SnapcastPort.Text, CultureInfo.InvariantCulture);
+            Properties.Settings.Default.volume_offset = int.Parse(VolumeOffset.Text, CultureInfo.InvariantCulture);
+
+            Properties.Settings.Default.nextTrack_mod = GetMod(Shortcut_NextTrack);
+            Properties.Settings.Default.nextTrack_vk = GetVk(Shortcut_NextTrack);
+            Properties.Settings.Default.previousTrack_mod = GetMod(Shortcut_PreviousTrack);
+            Properties.Settings.Default.previousTrack_vk = GetVk(Shortcut_PreviousTrack);
+            Properties.Settings.Default.playPause_mod = GetMod(Shortcut_PlayPause);
+            Properties.Settings.Default.playPause_vk = GetVk(Shortcut_PlayPause);
+            Properties.Settings.Default.volumeUp_mod = GetMod(Shortcut_VolumeUp);
+            Properties.Settings.Default.volumeUp_vk = GetVk(Shortcut_VolumeUp);
+            Properties.Settings.Default.volumeDown_mod = GetMod(Shortcut_VolumeDown);
+            Properties.Settings.Default.volumeDown_vk = GetVk(Shortcut_VolumeDown);
+            Properties.Settings.Default.volumeMute_mod = GetMod(Shortcut_VolumeMute);
+            Properties.Settings.Default.volumeMute_vk = GetVk(Shortcut_VolumeMute);
+            Properties.Settings.Default.showWindow_mod = GetMod(Shortcut_ShowWindow);
+            Properties.Settings.Default.showWindow_vk = GetVk(Shortcut_ShowWindow);
+
+            Properties.Settings.Default.Save();
+        }
+
+
+        // Hotkeys
+
+        void InitializeShortcuts()
+        {
+            System.Collections.Generic.IEnumerable<StackPanel> stackPanelCollection = RebindKeyWrapper.Children.OfType<StackPanel>();
+            StackPanel[] stackPanelList = stackPanelCollection.ToArray();
+
+            // Default state
+            for (int i = 0; i < stackPanelList.Length; i++)
+            {
+                ComboBox[] comboBoxList = stackPanelList[i].Children.OfType<ComboBox>().ToArray();
+                foreach (ComboBox comboBox in comboBoxList) // default status (for reset)
+                {
+                    comboBox.FontWeight = FontWeights.Light;
+                    comboBox.SelectedItem = "None";
+                }
+                TextBlock textBlock = (TextBlock)stackPanelList[i].Children.OfType<Button>().FirstOrDefault().Content;
+                textBlock.Text = "None";
+            }
+
+            // Populate values
+            for (int i = 0; i < stackPanelList.Length; i++)
+            {
+                // setup MOD
+                HotkeyHandler.MOD mod = _hotkeys._Shortcuts[i].mod;
+
+                HotkeyHandler.MOD[] MODList = System.Enum.GetValues(typeof(HotkeyHandler.MOD))
+                    .OfType<HotkeyHandler.MOD>()
+                    .Select(x => x & _hotkeys._Shortcuts[i].mod)
+                    .Where(x => x != HotkeyHandler.MOD.None)
+                    .ToArray();
+
+                ComboBox[] comboBox = stackPanelList[i].Children.OfType<ComboBox>().ToArray();
+                for (int j = 0; j < MODList.Length; j++)
+                {
+                    comboBox[j].SelectedItem = MODList[j].ToString();
+                    if (comboBox[j].SelectedItem.ToString() != "None")
+                        comboBox[j].FontWeight = FontWeights.Bold;
+                }
+
+                // setup VK
+                TextBlock textBlock = (TextBlock)stackPanelList[i].Children.OfType<Button>().FirstOrDefault().Content;
+                textBlock.Text = _hotkeys._Shortcuts[i].vk.ToString();
+                if (textBlock.Text != "None")
+                    textBlock.FontWeight = FontWeights.Bold;
+            }
+        }
+
+        private void HotkeyChanged()
+        {
+            _hotkeys.RemoveHotkeys();
+            _hotkeys.AddHotkeys();
+        }
+
+        private ref HotkeyHandler.HotkeyPair GetHotkeyVariable(string Name)
+        {
+            if (Name == "Shortcut_NextTrack")
+                return ref _hotkeys._NextTrack;
+            if (Name == "Shortcut_PreviousTrack")
+                return ref _hotkeys._PreviousTrack;
+            if (Name == "Shortcut_PlayPause")
+                return ref _hotkeys._PlayPause;
+            if (Name == "Shortcut_VolumeUp")
+                return ref _hotkeys._VolumeUp;
+            if (Name == "Shortcut_VolumeDown")
+                return ref _hotkeys._VolumeDown;
+            if (Name == "Shortcut_VolumeMute")
+                return ref _hotkeys._VolumeMute;
+            if (Name == "Shortcut_ShowWindow")
+                return ref _hotkeys._ShowWindow;
+            return ref _hotkeys._NextTrack;
+        }
+
+        private void UpdateHotkey_MOD(string Name, HotkeyHandler.MOD mod) => GetHotkeyVariable(Name).SetMOD(mod);
+        private void UpdateHotkey_VK(string Name, HotkeyHandler.VK vk) => GetHotkeyVariable(Name).SetVK(vk);
+
+        private void MOD_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (!IsLoaded)
+                return;
+
+            ComboBox comboBox = (ComboBox)sender;
+            StackPanel stackPanel = (StackPanel)comboBox.Parent;
+            System.Collections.Generic.IEnumerable<ComboBox> stackPanelCollection = stackPanel.Children.OfType<ComboBox>();
+
+            HotkeyHandler.MOD MOD1, MOD2;
+
+            // we need to do this because the element is modified -after- this function
+            if (comboBox.Tag.ToString() == "MOD1")
+            {
+                MOD1 = GetMOD(e.AddedItems[0].ToString());
+                MOD2 = GetMOD(stackPanelCollection.Last().Text);
+            }
+            else
+            {
+                MOD1 = GetMOD(stackPanelCollection.First().Text);
+                MOD2 = GetMOD(e.AddedItems[0].ToString());
+            }
+
+            if (e.AddedItems[0].ToString() == "None")
+                comboBox.FontWeight = FontWeights.Light;
+            else
+                comboBox.FontWeight = FontWeights.Bold;
+
+            HotkeyHandler.MOD ModKey = MOD1 | MOD2;
+
+            UpdateHotkey_MOD(stackPanel.Name, ModKey);
+            HotkeyChanged();
+        }
+
+        private void RemapKey_Clicked(object sender, RoutedEventArgs e)
+        {
+            Button button = (Button)sender;
+            TextBlock textBlock = (TextBlock)button.Content;
+            textBlock.Text = unison.Resources.Resources.Settings_ShortcutsKey;
+            textBlock.FontWeight = FontWeights.Bold;
+            button.PreviewKeyDown += DetectPressedKey;
+        }
+
+        private void DetectPressedKey(object sender, KeyEventArgs e)
+        {
+            e.Handled = true;
+
+            Key pressedKey = e.Key;
+            HotkeyHandler.VK VirtualKey = GetVirtualKey(pressedKey);
+
+            Button button = (Button)sender;
+            TextBlock textBlock = (TextBlock)button.Content;
+            StackPanel stackPanel = (StackPanel)button.Parent;
+
+            if (VirtualKey == HotkeyHandler.VK.None)
+            {
+                pressedKey = Key.None;
+                textBlock.FontWeight = FontWeights.Light;
+            }
+            else
+                textBlock.FontWeight = FontWeights.Bold;
+
+            textBlock.Text = pressedKey.ToString();
+            button.PreviewKeyDown -= DetectPressedKey;
+
+            UpdateHotkey_VK(stackPanel.Name, VirtualKey);
+            HotkeyChanged();
+        }
+
+        private HotkeyHandler.VK GetVirtualKey(Key key)
+        {
+            foreach (object value in System.Enum.GetValues(typeof(HotkeyHandler.VK)))
+            {
+                if (key.ToString().ToLower() == value.ToString().ToLower())
+                    return (HotkeyHandler.VK)value;
+            }
+            return HotkeyHandler.VK.None;
+        }
+
+        private HotkeyHandler.MOD GetMOD(string str)
+        {
+            foreach (object value in System.Enum.GetValues(typeof(HotkeyHandler.MOD)))
+            {
+                if (str.ToLower() == value.ToString().ToLower())
+                    return (HotkeyHandler.MOD)value;
+            }
+            return HotkeyHandler.MOD.None;
+        }
+
+        private void ShortcutsReset_Clicked(object sender, RoutedEventArgs e)
+        {
+            Properties.Settings.Default.nextTrack_mod = (uint)Application.Current.FindResource("nextTrack_mod");
+            Properties.Settings.Default.nextTrack_vk = (uint)Application.Current.FindResource("nextTrack_vk");
+            Properties.Settings.Default.previousTrack_mod = (uint)Application.Current.FindResource("previousTrack_mod");
+            Properties.Settings.Default.previousTrack_vk = (uint)Application.Current.FindResource("previousTrack_vk");
+            Properties.Settings.Default.playPause_mod = (uint)Application.Current.FindResource("playPause_mod");
+            Properties.Settings.Default.playPause_vk = (uint)Application.Current.FindResource("playPause_vk");
+            Properties.Settings.Default.volumeUp_mod = (uint)Application.Current.FindResource("volumeUp_mod");
+            Properties.Settings.Default.volumeUp_vk = (uint)Application.Current.FindResource("volumeUp_vk");
+            Properties.Settings.Default.volumeDown_mod = (uint)Application.Current.FindResource("volumeDown_mod");
+            Properties.Settings.Default.volumeDown_vk = (uint)Application.Current.FindResource("volumeDown_vk");
+            Properties.Settings.Default.volumeMute_mod = (uint)Application.Current.FindResource("volumeMute_mod");
+            Properties.Settings.Default.volumeMute_vk = (uint)Application.Current.FindResource("volumeMute_vk");
+            Properties.Settings.Default.showWindow_mod = (uint)Application.Current.FindResource("showWindow_mod");
+            Properties.Settings.Default.showWindow_vk = (uint)Application.Current.FindResource("showWindow_vk");
+
+            _hotkeys.Initialize();
+            HotkeyChanged();
+            InitializeShortcuts();
+        }
+
+        public uint GetMod(StackPanel stackPanel)
+        {
+            return (uint)(GetMOD(stackPanel.Children.OfType<ComboBox>().First().SelectedItem.ToString()) | GetMOD(stackPanel.Children.OfType<ComboBox>().Last().SelectedItem.ToString()));
+        }
+
+        public uint GetVk(StackPanel stackPanel)
+        {
+            Button button = stackPanel.Children.OfType<Button>().First();
+            TextBlock textBlock = (TextBlock)button.Content;
+            return (uint)(HotkeyHandler.VK)System.Enum.Parse(typeof(HotkeyHandler.VK), textBlock.Text, true);
+        }
     }
 }

unison.csproj

@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Resources\icon-full.ico</ApplicationIcon>
     <Win32Resource></Win32Resource>
     <StartupObject>unison.App</StartupObject>
-    <Version>1.1</Version>
+    <Version>1.3.1</Version>
     <Company />
     <Authors>Théo Marchal</Authors>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageProjectUrl>https://git.n700.ovh/keb/unison</PackageProjectUrl>
+    <PackageProjectUrl>https://github.com/ZetaKebab/unison</PackageProjectUrl>
-    <RepositoryUrl>https://git.n700.ovh/keb/unison</RepositoryUrl>
+    <RepositoryUrl>https://github.com/ZetaKebab/unison</RepositoryUrl>
     <Copyright>Théo Marchal</Copyright>
     <PackageIconUrl />
   </PropertyGroup>
@@ -22,13 +22,8 @@
     <None Remove="Resources\icon-mini.ico" />
     <None Remove="Resources\nocover.png" />
     <None Remove="LICENSE" />
-    <None Remove="snapclient_0.25.0-1_win64\FLAC.dll" />
+    <None Remove="Resources\nothing.png" />
-    <None Remove="snapclient_0.25.0-1_win64\ogg.dll" />
+    <None Remove="Resources\radio.png" />
-    <None Remove="snapclient_0.25.0-1_win64\opus.dll" />
-    <None Remove="snapclient_0.25.0-1_win64\README.txt" />
-    <None Remove="snapclient_0.25.0-1_win64\snapclient.exe" />
-    <None Remove="snapclient_0.25.0-1_win64\soxr.dll" />
-    <None Remove="snapclient_0.25.0-1_win64\vorbis.dll" />
     <None Include="LICENSE">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
@@ -45,40 +40,22 @@
     <Resource Include="Resources\nocover.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>
+    <Resource Include="Resources\nothing.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Resources\radio.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <Content Include="LICENSE">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="snapclient_0.25.0-1_win64\README.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="snapclient_0.25.0-1_win64\FLAC.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="snapclient_0.25.0-1_win64\ogg.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="snapclient_0.25.0-1_win64\opus.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="snapclient_0.25.0-1_win64\snapclient.exe">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="snapclient_0.25.0-1_win64\soxr.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="snapclient_0.25.0-1_win64\vorbis.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Emoji.Wpf" Version="0.3.3" />
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
     <PackageReference Include="RadioBrowser" Version="0.6.1" />
-  </ItemGroup>
+	<PackageReference Include="MpcNET" Version="1.4.0" />
-
-  <ItemGroup>
-    <ProjectReference Include="..\MpcNET\MpcNET.csproj" />
   </ItemGroup>
 
   <ItemGroup>
@@ -95,6 +72,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <EmbeddedResource Update="Resources\Resources.es-ES.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+    </EmbeddedResource>
     <EmbeddedResource Update="Resources\Resources.fr-FR.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
     </EmbeddedResource>
@@ -109,6 +89,27 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <None Update="snapclient_0.26.0-1_win64\FLAC.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="snapclient_0.26.0-1_win64\ogg.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="snapclient_0.26.0-1_win64\opus.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="snapclient_0.26.0-1_win64\README.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="snapclient_0.26.0-1_win64\snapclient.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="snapclient_0.26.0-1_win64\soxr.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="snapclient_0.26.0-1_win64\vorbis.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>

unison.sln

@@ -4,11 +4,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 16.0.31515.178
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "unison", "unison.csproj", "{489048C4-3FCA-4573-B34C-943D03F94D04}"
-	ProjectSection(ProjectDependencies) = postProject
-		{230556C6-5AC3-4FD8-8947-C9ABF1416D19} = {230556C6-5AC3-4FD8-8947-C9ABF1416D19}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MpcNET", "..\MpcNET\MpcNET.csproj", "{230556C6-5AC3-4FD8-8947-C9ABF1416D19}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,12 +18,6 @@ Global
 		{489048C4-3FCA-4573-B34C-943D03F94D04}.Release|Any CPU.Build.0 = Release|Any CPU
 		{489048C4-3FCA-4573-B34C-943D03F94D04}.Release-Stable|Any CPU.ActiveCfg = Release|Any CPU
 		{489048C4-3FCA-4573-B34C-943D03F94D04}.Release-Stable|Any CPU.Build.0 = Release|Any CPU
-		{230556C6-5AC3-4FD8-8947-C9ABF1416D19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{230556C6-5AC3-4FD8-8947-C9ABF1416D19}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{230556C6-5AC3-4FD8-8947-C9ABF1416D19}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{230556C6-5AC3-4FD8-8947-C9ABF1416D19}.Release|Any CPU.Build.0 = Release|Any CPU
-		{230556C6-5AC3-4FD8-8947-C9ABF1416D19}.Release-Stable|Any CPU.ActiveCfg = Release-Stable|Any CPU
-		{230556C6-5AC3-4FD8-8947-C9ABF1416D19}.Release-Stable|Any CPU.Build.0 = Release-Stable|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE