App.xaml.cs

@@ -1,16 +1,6 @@
-using System;
+using System.Windows;
-using System.Diagnostics;
-using System.Windows;
 using Hardcodet.Wpf.TaskbarNotification;
 
-// todo:
-//
-// * finish correct refresh of mpd
-// * show mpd version
-// * change volume offset
-// * fix window resize
-// * show covers
-
 namespace unison
 {
     public partial class App : Application
@@ -24,21 +14,19 @@ namespace unison
         {
             base.OnStartup(e);
 
+            Hotkeys = new HotkeyHandler();
+            Current.Properties["hotkeys"] = Hotkeys;
+
             Snapcast = new SnapcastHandler();
             Current.Properties["snapcast"] = Snapcast;
 
             MPD = new MPDHandler();
             Current.Properties["mpd"] = MPD;
 
-            Hotkeys = new HotkeyHandler();
-            Current.Properties["hotkeys"] = Hotkeys;
-
             Current.MainWindow = new MainWindow();
 
             Systray = (TaskbarIcon)FindResource("SystrayTaskbar");
             Current.Properties["systray"] = Systray;
-
-            MPD.Start();
         }
 
         protected override void OnExit(ExitEventArgs e)

Handlers/MPDHandler.cs

@@ -1,8 +1,6 @@
-using System;
+using System.Collections.Generic;
-using System.Diagnostics;
 using System.Threading.Tasks;
-using System.Windows;
+
-using System.Windows.Threading;
 using MPDCtrl.Models;
 
 namespace unison
@@ -21,136 +19,18 @@ namespace unison
 
         private Status _currentStatus = null;
         private SongInfoEx _currentSong = null;
-        private AlbumImage _currentAlbumCover = null;
-
-        public double _elapsed;
-        private double _time;
-
-        private readonly System.Timers.Timer _elapsedTimer;
-        private async void ElapsedTimer(object sender, System.Timers.ElapsedEventArgs e)
-        {
-            if ((_elapsed < _time) && (_mpd.MpdStatus.MpdState == Status.MpdPlayState.Play))
-            {
-                _elapsed += 0.5;
-                await Task.Delay(5);
-            }
-            else
-            {
-                _elapsedTimer.Stop();
-            }
-        }
-
-        bool IsBusy = false;
 
         public MPDHandler()
         {
-            _mpd.IsBusy += new MPC.IsBusyEvent(OnMpcIsBusy);
-
-            _mpd.MpdIdleConnected += new MPC.IsMpdIdleConnectedEvent(OnMpdIdleConnected);
-
-            _mpd.ConnectionStatusChanged += new MPC.ConnectionStatusChangedEvent(OnConnectionStatusChanged);
-            _mpd.ConnectionError += new MPC.ConnectionErrorEvent(OnConnectionError);
-
-            _mpd.MpdPlayerStatusChanged += new MPC.MpdPlayerStatusChangedEvent(OnMpdPlayerStatusChanged);
-            _mpd.MpdCurrentQueueChanged += new MPC.MpdCurrentQueueChangedEvent(OnMpdCurrentQueueChanged);
-
-            _mpd.MpdAlbumArtChanged += new MPC.MpdAlbumArtChangedEvent(OnAlbumArtChanged);
-
-            _elapsedTimer = new System.Timers.Timer(500);
-            _elapsedTimer.Elapsed += new System.Timers.ElapsedEventHandler(ElapsedTimer);
-
-
-            DispatcherTimer timer = new DispatcherTimer();
-            timer.Interval = TimeSpan.FromSeconds(2);
-            timer.Tick += QueryStatus;
-            timer.Start();
         }
 
-        private void OnMpcIsBusy(MPC sender, bool on)
+        public async void Connect()
-        {
-            IsBusy = on;
-        }
-
-        public void Start()
-        {
-            Task.Run(() => _mpd.MpdIdleConnect(Properties.Settings.Default.mpd_host, Properties.Settings.Default.mpd_port));
-        }
-
-        private void OnMpdIdleConnected(MPC sender)
-        {
-            Trace.WriteLine($"Connection to mpd {_mpd.MpdVerText}...");
-            LoadInitialData();
-        }
-
-        private void OnConnectionStatusChanged(MPC sender, MPC.ConnectionStatus status)
-        {
-            Trace.WriteLine("Connection changed...");
-        }
-
-        private void OnConnectionError(MPC sender, string msg)
-        {
-            Trace.WriteLine("Connection ERROR!");
-            LoadInitialData();
-        }
-
-        private void OnMpdPlayerStatusChanged(MPC sender)
-        {
-            Trace.WriteLine("Status changed...");
-
-            UpdateStatus();
-        }
-
-        private void OnMpdCurrentQueueChanged(MPC sender)
-        {
-            Trace.WriteLine("Queue changed...");
-
-            UpdateStatus();
-        }
-
-        private void OnAlbumArtChanged(MPC sender)
-        {
-            // AlbumArt
-            if (Application.Current == null) { return; }
-            Application.Current.Dispatcher.Invoke(() =>
-            {
-                if ((!_mpd.AlbumCover.IsDownloading) && _mpd.AlbumCover.IsSuccess)
-                {
-                    if ((_mpd.MpdCurrentSong != null) && (_mpd.AlbumCover.AlbumImageSource != null))
-                    {
-                        if (!String.IsNullOrEmpty(_mpd.MpdCurrentSong.File))
-                        {
-                            if (_mpd.MpdCurrentSong.File == _mpd.AlbumCover.SongFilePath)
-                            {
-                                Trace.WriteLine("found cover");
-                                _currentAlbumCover = _mpd.AlbumCover;
-                            }
-                        }
-                    }
-                }
-            });
-        }
-
-        public async void LoadInitialData()
-        {
-            //todo : test if the password works
-
-            IsBusy = true;
-            await Task.Delay(5);
-
-            CommandResult result = await _mpd.MpdIdleSendPassword(Properties.Settings.Default.mpd_password);
-
-            if (result.IsSuccess)
         {
             _connected = await _mpd.MpdCommandConnectionStart(Properties.Settings.Default.mpd_host, Properties.Settings.Default.mpd_port, Properties.Settings.Default.mpd_password);
             if (_connected)
             {
-                    await _mpd.MpdSendUpdate();
+                await _mpd.MpdQueryStatus();
-
-                    result = await _mpd.MpdIdleQueryStatus();
                 await Task.Delay(5);
-
-                    if (result.IsSuccess)
-                    {
                 _currentVolume = _mpd.MpdStatus.MpdVolume;
                 _currentRandom = _mpd.MpdStatus.MpdRandom;
                 _currentRepeat = _mpd.MpdStatus.MpdRepeat;
@@ -158,99 +38,55 @@ namespace unison
                 _currentConsume = _mpd.MpdStatus.MpdConsume;
                 _currentElapsed = _mpd.MpdStatus.MpdSongElapsed;
             }
-
-                    await Task.Delay(5);
-                    CommandResult song = await _mpd.MpdIdleQueryCurrentSong();
-                    await Task.Delay(5);
-                    if (song != null)
-                        _currentSong = _mpd.MpdCurrentSong;
-
-                    await Task.Delay(5);
-                    _mpd.MpdIdleStart();
-                    await Task.Delay(5);
-                    UpdateStatus();
-                }
-            }
         }
 
-        public async void QueryStatus(object sender, EventArgs e)
+        public void CheckStatus<T>(ref T a, T b)
         {
-            if (IsBusy)
+            if (Comparer<T>.Default.Compare(a, b) != 0)
-                return;
+                a = b;
-
-            Trace.WriteLine("Querying status...");
-
-            CommandResult result = await _mpd.MpdQueryStatus();
-            await Task.Delay(5);
-
-            if (result.IsSuccess)
-            {
-                result = await _mpd.MpdQueryCurrentSong();
-                await Task.Delay(5);
-
-                if (result.IsSuccess)
-                {
-                    UpdateStatus();
-                }
-            }
         }
 
-        public async void UpdateStatus()
+        public async void Loop()
         {
             if (!_connected)
                 return;
 
-            await Task.Delay(50);
+            CommandResult status = await _mpd.MpdQueryStatus();
-
+            //Trace.WriteLine(status.ResultText);
+            await Task.Delay(5);
+            if (status != null)
+            {
                 _currentStatus = _mpd.MpdStatus;
 
-            _currentRandom = _mpd.MpdStatus.MpdRandom;
+                CheckStatus(ref _currentVolume, _mpd.MpdStatus.MpdVolume);
-            _currentRepeat = _mpd.MpdStatus.MpdRepeat;
+                CheckStatus(ref _currentRandom, _mpd.MpdStatus.MpdRandom);
-            _currentConsume = _mpd.MpdStatus.MpdConsume;
+                CheckStatus(ref _currentRepeat, _mpd.MpdStatus.MpdRepeat);
-            _currentSingle = _mpd.MpdStatus.MpdSingle;
+                CheckStatus(ref _currentSingle, _mpd.MpdStatus.MpdSingle);
-
+                CheckStatus(ref _currentConsume, _mpd.MpdStatus.MpdConsume);
-            _currentVolume = _mpd.MpdStatus.MpdVolume;
+                CheckStatus(ref _currentElapsed, _mpd.MpdStatus.MpdSongElapsed);
-            _currentElapsed = _mpd.MpdStatus.MpdSongElapsed;
+            }
 
+            CommandResult song = await _mpd.MpdQueryCurrentSong();
+            await Task.Delay(5);
+            if (song != null)
                 _currentSong = _mpd.MpdCurrentSong;
-
-            _time = _mpd.MpdStatus.MpdSongTime;
-
-            _elapsed = _mpd.MpdStatus.MpdSongElapsed;
-
-            if (_mpd.MpdStatus.MpdState == Status.MpdPlayState.Play)
-            {
-                if (!_elapsedTimer.Enabled)
-                    _elapsedTimer.Start();
-            }
-            else
-            {
-                _elapsedTimer.Stop();
-            }
-
-            await _mpd.MpdQueryAlbumArt(_currentSong.File, false);
         }
 
         public SongInfoEx GetCurrentSong() => _currentSong;
         public Status GetStatus() => _currentStatus;
-        public AlbumImage GetCover() => _currentAlbumCover;
 
         public async void Prev()
         {
-            if (!IsBusy)
             await _mpd.MpdPlaybackPrev(_currentVolume);
         }
 
         public async void Next()
         {
-            if (!IsBusy)
             await _mpd.MpdPlaybackNext(_currentVolume);
         }
 
         public async void PlayPause()
         {
-            if (IsBusy)
-                return;
             if (_mpd.MpdStatus.MpdState == Status.MpdPlayState.Play)
                 await _mpd.MpdPlaybackPause();
             else if (_mpd.MpdStatus.MpdState == Status.MpdPlayState.Pause)
@@ -259,37 +95,34 @@ namespace unison
 
         public async void Random()
         {
-            if (!IsBusy)
             await _mpd.MpdSetRandom(!_currentRandom);
+
         }
 
         public async void Repeat()
         {
-            if (!IsBusy)
             await _mpd.MpdSetRepeat(!_currentRepeat);
+
         }
 
         public async void Single()
         {
-            if (!IsBusy)
             await _mpd.MpdSetSingle(!_currentSingle);
+
         }
 
         public async void Consume()
         {
-            if (!IsBusy)
             await _mpd.MpdSetConsume(!_currentConsume);
+
         }
 
         public async void SetVolume(int value)
         {
-            if (!IsBusy)
             await _mpd.MpdSetVolume(value);
+
         }
 
-        public bool IsPlaying()
+        public bool IsPlaying() => _currentStatus?.MpdState == MPDCtrl.Models.Status.MpdPlayState.Play;
-        {
-            return _currentStatus?.MpdState == MPDCtrl.Models.Status.MpdPlayState.Play;
-        }
     }
 }

MPDCtrl/BinaryDownloader.cs

@@ -103,8 +103,6 @@ namespace MPDCtrl.Models
 
                     string response = await _binaryReader.ReadLineAsync();
 
-                    if (response != null)
-                    {
                     if (response.StartsWith("OK MPD "))
                     {
                         MpdVersion = response.Replace("OK MPD ", string.Empty).Trim();
@@ -119,7 +117,6 @@ namespace MPDCtrl.Models
 
                         // Done for now.
                     }
-                    }
                     else
                     {
                         Debug.WriteLine("**** TCP Binary Connection: MPD did not respond with proper respose@MpdBinaryConnect");

MPDCtrl/MPC.cs

@@ -10,7 +10,6 @@ using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media.Imaging;
-using unison;
 
 namespace MPDCtrl.Models
 {
@@ -189,8 +188,8 @@ namespace MPDCtrl.Models
         public delegate void MpdCurrentQueueChangedEvent(MPC sender);
         public event MpdCurrentQueueChangedEvent MpdCurrentQueueChanged;
 
-        //public delegate void MpdPlaylistsChangedEvent(MPC sender);
+        public delegate void MpdPlaylistsChangedEvent(MPC sender);
-        //public event MpdPlaylistsChangedEvent MpdPlaylistsChanged;
+        public event MpdPlaylistsChangedEvent MpdPlaylistsChanged;
 
         public delegate void MpdAlbumArtChangedEvent(MPC sender);
         public event MpdAlbumArtChangedEvent MpdAlbumArtChanged;
@@ -921,7 +920,7 @@ namespace MPDCtrl.Models
             {
                 bool isPlayer = false;
                 bool isCurrentQueue = false;
-                //bool isStoredPlaylist = false;
+                bool isStoredPlaylist = false;
 
                 foreach (string line in SubSystems)
                 {
@@ -948,7 +947,7 @@ namespace MPDCtrl.Models
                     if (line.ToLower() == "changed: stored_playlist")
                     {
                         // stored_playlist: a stored playlist has been modified, renamed, created or deleted
-                        //isStoredPlaylist = true;
+                        isStoredPlaylist = true;
                     }
                 }
 
@@ -961,18 +960,7 @@ namespace MPDCtrl.Models
                     }
                 }
 
-                // custom test
                 if (isCurrentQueue)
-                {
-                    CommandResult idleResult = await MpdIdleQueryCurrentSong();
-                    if (idleResult.IsSuccess)
-                    {
-                        MpdCurrentQueueChanged?.Invoke(this);
-                    }
-                }
-
-                // takes lot of time
-                /*if (isCurrentQueue)
                 {
                     CommandResult idleResult = await MpdIdleQueryCurrentQueue();
                     if (idleResult.IsSuccess)
@@ -988,7 +976,7 @@ namespace MPDCtrl.Models
                     {
                         MpdPlaylistsChanged?.Invoke(this);
                     }
-                }*/
+                }
 
                 //MpcProgress?.Invoke(this, "");
 
@@ -2621,6 +2609,15 @@ namespace MPDCtrl.Models
             {
                 Debug.WriteLine("Exception@ParseStatus:" + ex.Message);
 
+                if (Application.Current != null)
+                {
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        /*App app = App.Current as App;
+                        app.AppendErrorLog("Exception@MPC@ParseStatus", ex.Message);*/
+                    });
+                }
+
                 IsBusy?.Invoke(this, false);
                 return Task.FromResult(false);
             }
@@ -2699,6 +2696,15 @@ namespace MPDCtrl.Models
             {
                 Debug.WriteLine("Error@ParseCurrentSong: " + ex.Message);
 
+                if (Application.Current != null)
+                {
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        /*App app = App.Current as App;
+                        app.AppendErrorLog("Exception@MPC@ParseCurrentSong", ex.Message);*/
+                    });
+                }
+
                 return Task.FromResult(false);
             }
             finally
@@ -2911,6 +2917,15 @@ namespace MPDCtrl.Models
             {
                 Debug.WriteLine("Exception@ParsePlaylistInfo: " + ex.Message);
 
+                if (Application.Current != null)
+                {
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        /*App app = App.Current as App;
+                        app.AppendErrorLog("Exception@MPC@ParsePlaylistInfo", ex.Message);*/
+                    });
+                }
+
                 return Task.FromResult(false);
             }
             finally
@@ -3054,6 +3069,15 @@ namespace MPDCtrl.Models
             {
                 Debug.WriteLine("Error@FillSongInfoEx: " + e.ToString());
 
+                if (Application.Current != null)
+                {
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        /*App app = App.Current as App;
+                        app.AppendErrorLog("Exception@MPC@FillSongInfoEx", e.Message);*/
+                    });
+                }
+
                 return null;
             }
         }
@@ -3158,6 +3182,15 @@ namespace MPDCtrl.Models
             {
                 Debug.WriteLine("Error@ParsePlaylists: " + e.ToString());
 
+                if (Application.Current != null)
+                {
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        /*App app = App.Current as App;
+                        app.AppendErrorLog("Exception@MPC@ParsePlaylists", e.Message);*/
+                    });
+                }
+
                 IsBusy?.Invoke(this, false);
                 return Task.FromResult(false);
             }
@@ -3244,6 +3277,15 @@ namespace MPDCtrl.Models
             {
                 Debug.WriteLine("Error@ParseListAll: " + e.ToString());
 
+                if (Application.Current != null)
+                {
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        /*App app = App.Current as App;
+                        app.AppendErrorLog("Exception@MPC@ParseListAll", e.Message);*/
+                    });
+                }
+
                 IsBusy?.Invoke(this, false);
                 return Task.FromResult(false); ;
             }
@@ -3382,6 +3424,15 @@ namespace MPDCtrl.Models
             {
                 Debug.WriteLine("Error@ParseSearchResult: " + ex.Message);
 
+                if (Application.Current != null)
+                {
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        /*App app = App.Current as App;
+                        app.AppendErrorLog("Exception@MPC@ParseSearchResult", ex.Message);*/
+                    });
+                }
+
                 IsBusy?.Invoke(this, false);
                 return Task.FromResult(false);
             }
@@ -3514,6 +3565,15 @@ namespace MPDCtrl.Models
             {
                 Debug.WriteLine("Error@ParsePlaylistSongsResult: " + ex.Message);
 
+                if (Application.Current != null)
+                {
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        /*App app = App.Current as App;
+                        app.AppendErrorLog("Exception@MPC@ParsePlaylistSongsResult", ex.Message);*/
+                    });
+                }
+
                 return songList;
             }
 

Views/MainWindow.xaml

@@ -25,7 +25,7 @@
                                 <TextBlock x:Name="SongTitle" TextWrapping="Wrap" TextAlignment="Center" FontWeight="Normal" FontSize="20" Text="Title"/>
                                 <TextBlock x:Name="SongArtist" TextWrapping="Wrap" TextAlignment="Center" FontWeight="Bold" FontSize="18"  Text="Artist"/>
                                 <TextBlock x:Name="SongAlbum" TextWrapping="Wrap" TextAlignment="Center" FontWeight="Normal" FontSize="16"  Text="Album"/>
-                                <TextBlock x:Name="Bitrate" TextWrapping="Wrap" TextAlignment="Center" FontWeight="Normal"  Text="Bitrate" Foreground="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}"/>
+                                <TextBlock x:Name="Bitrate" TextWrapping="Wrap" TextAlignment="Center" FontWeight="Normal"  Text="Bitrate"/>
                             </StackPanel>
                         </Grid>
                         <Grid x:Name="Controls" VerticalAlignment="Top" Margin="10,106,10,0">
@@ -93,8 +93,7 @@
                         <StackPanel.OpacityMask>
                             <VisualBrush Visual="{Binding ElementName=mask}"/>
                         </StackPanel.OpacityMask>
-                        <Image x:Name="Cover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/images/nocover.png" Visibility="Collapsed" />
+                        <Image HorizontalAlignment="Center" VerticalAlignment="Center" Source="/images/nocover.png" />
-                        <Image x:Name="NoCover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/images/nocover.png" />
                     </StackPanel>
                 </Grid>
             </Border>

Views/MainWindow.xaml.cs

@@ -1,17 +1,20 @@
 using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Threading;
 using System.Windows.Interop;
+using System.Diagnostics;
 
 namespace unison
 {
-    public partial class MainWindow : Window, INotifyPropertyChanged
+    public partial class MainWindow : Window
     {
         private readonly Settings SettingsWindow = new Settings();
 
-        private MPDHandler mpd;
+        private readonly MPDHandler mpd;
 
         Thickness SelectedThickness;
         Thickness BaseThickness;
@@ -24,9 +27,10 @@ namespace unison
             WindowState = WindowState.Minimized;
 
             mpd = (MPDHandler)Application.Current.Properties["mpd"];
+            mpd.Connect();
 
             DispatcherTimer timer = new DispatcherTimer();
-            timer.Interval = TimeSpan.FromSeconds(0.5);
+            timer.Interval = TimeSpan.FromSeconds(0.2);
             timer.Tick += Timer_Tick;
             timer.Start();
 
@@ -37,6 +41,9 @@ namespace unison
 
         private void Timer_Tick(object sender, EventArgs e)
         {
+            MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
+            mpd.Loop();
+
             UpdateInterface();
         }
 
@@ -56,7 +63,7 @@ namespace unison
 
         public void UpdateInterface()
         {
-            if (mpd.GetCurrentSong() != null && mpd.GetStatus() != null)
+            if (mpd.GetCurrentSong() != null)
             {
                 SongTitle.Text = mpd.GetCurrentSong().Title;
                 SongTitle.ToolTip = mpd.GetCurrentSong().File;
@@ -67,11 +74,11 @@ namespace unison
                 Bitrate.Text = mpd.GetCurrentSong().File.Substring(mpd.GetCurrentSong().File.LastIndexOf(".") + 1) + " – ";
                 Bitrate.Text += mpd.GetStatus().MpdBitrate + "kbps";
 
-                CurrentTime.Text = FormatSeconds(mpd._elapsed);
+                CurrentTime.Text = FormatSeconds(mpd._currentElapsed);
                 EndTime.Text = FormatSeconds(mpd.GetStatus().MpdSongTime);
 
                 if (!System.Double.IsNaN(mpd.GetCurrentSong().TimeSort))
-                    TimeSlider.Value = mpd._elapsed / mpd.GetCurrentSong().TimeSort * 100;
+                    TimeSlider.Value = mpd._currentElapsed / mpd.GetCurrentSong().TimeSort * 100;
             }
 
             if (VolumeSlider.Value != mpd._currentVolume)
@@ -97,28 +104,11 @@ namespace unison
             UpdateButton(ref BorderRepeat, mpd._currentRepeat);
             UpdateButton(ref BorderSingle, mpd._currentSingle);
             UpdateButton(ref BorderConsume, mpd._currentConsume);
-
-            if (mpd.GetCover() != null)
-            {
-                if ((!mpd.GetCover().IsDownloading) && mpd.GetCover().IsSuccess)
-                {
-                    if (mpd.GetCurrentSong().File == mpd.GetCover().SongFilePath)
-                    {
-                        Cover.Source = mpd.GetCover().AlbumImageSource;
-                        Cover.Visibility = Visibility.Visible;
-                        NoCover.Visibility = Visibility.Collapsed;
-                        return;
-                    }
-                }
-            }
-            NoCover.Visibility = Visibility.Visible;
-            Cover.Visibility = Visibility.Collapsed;
         }
 
         public void Pause_Clicked(object sender, RoutedEventArgs e) => mpd.PlayPause();
         public void Previous_Clicked(object sender, RoutedEventArgs e) =>  mpd.Prev();
         public void Next_Clicked(object sender, RoutedEventArgs e) => mpd.Next();
-
         public void Random_Clicked(object sender, RoutedEventArgs e) => mpd.Random();
         public void Repeat_Clicked(object sender, RoutedEventArgs e) => mpd.Repeat();
         public void Single_Clicked(object sender, RoutedEventArgs e) => mpd.Single();
@@ -162,12 +152,5 @@ namespace unison
             WindowInteropHelper helper = new(this);
             helper.EnsureHandle();
         }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
     }
 }

Views/Settings.xaml.cs

@@ -46,7 +46,7 @@ namespace unison
 
             MpdHost.Text = Properties.Settings.Default.mpd_host;
             MpdPort.Text = Properties.Settings.Default.mpd_port.ToString();
-            MpdPassword.Text = null; //Properties.Settings.Default.mpd_password;
+            MpdPassword.Text = Properties.Settings.Default.mpd_password;
             SnapcastStartup.IsChecked = Properties.Settings.Default.snapcast_startup;
             SnapcastPath.Text = Properties.Settings.Default.snapcast_path;
             SnapcastPort.Text = Properties.Settings.Default.snapcast_port.ToString();
@@ -70,7 +70,7 @@ namespace unison
         {
             SaveSettings();
             MPDHandler mpd = (MPDHandler)Application.Current.Properties["mpd"];
-            //mpd.Connect();
+            mpd.Connect();
         }
 
         private void SnapcastReset_Clicked(object sender, RoutedEventArgs e)
@@ -83,7 +83,7 @@ namespace unison
         {
             Properties.Settings.Default.mpd_host = MpdHost.Text;
             Properties.Settings.Default.mpd_port = int.Parse(MpdPort.Text, CultureInfo.InvariantCulture);
-            Properties.Settings.Default.mpd_password = null;//MpdPassword.Text;
+            Properties.Settings.Default.mpd_password = MpdPassword.Text;
             Properties.Settings.Default.snapcast_startup = (bool)SnapcastStartup.IsChecked;
             Properties.Settings.Default.snapcast_path = SnapcastPath.Text;
             Properties.Settings.Default.snapcast_port = int.Parse(SnapcastPort.Text, CultureInfo.InvariantCulture);

unison.csproj

@@ -12,6 +12,7 @@
 
   <ItemGroup>
     <None Remove="images\nocover-test.png" />
+    <None Remove="images\nocover.png" />
     <None Remove="images\unison.ico" />
     <None Remove="LICENSE" />
     <None Remove="snapclient_0.25.0-1_win64\FLAC.dll" />
@@ -24,6 +25,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <Resource Include="images\nocover-test.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Resource>
     <Resource Include="images\nocover.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Resource>