CHANGELOG.md

@@ -1,19 +1,5 @@
 # Changelog
 
-## 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*

Views/MainWindow.xaml

@@ -104,8 +104,7 @@
                             <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" Visibility="Collapsed" />
-                        <Image x:Name="RadioCover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/radio.png" Visibility="Collapsed" />
+                        <Image x:Name="NoCover" HorizontalAlignment="Center" VerticalAlignment="Center" Source="/Resources/nocover.png" />
                     </StackPanel>
                 </Grid>
             </Border>

Views/MainWindow.xaml.cs

@@ -54,16 +54,11 @@ namespace unison
                 _mpd.QueryStats();
                 _settingsWin.UpdateStats();
 
-                // _mpd.QueryPlaylist().ConfigureAwait(false);
-                // to remove
-
-                ConnectionOkIcon.Visibility = Visibility.Visible;
-                ConnectionFailIcon.Visibility = Visibility.Collapsed;
+                _mpd.QueryPlaylist().ConfigureAwait(false);
 
                 Snapcast.IsEnabled = true;
-                if (_radiosWin.IsConnected())
-                    Radio.IsEnabled = true;
-
+                ConnectionOkIcon.Visibility = Visibility.Visible;
+                ConnectionFailIcon.Visibility = Visibility.Collapsed;
                 _shuffleWin.Initialize();
             }
             else
@@ -72,9 +67,6 @@ 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}";
@@ -191,9 +183,8 @@ namespace unison
             PlayPause.Text = (string)Application.Current.FindResource("pauseButton");
             TimeSlider.Value = 50;
             TimeSlider.IsEnabled = false;
-            NoCover.Visibility = Visibility.Collapsed;
+            NoCover.Visibility = Visibility.Visible;
             Cover.Visibility = Visibility.Collapsed;
-            RadioCover.Visibility = Visibility.Collapsed;
 
             if (LostConnection)
             {
@@ -205,18 +196,16 @@ namespace unison
 
         public void OnCoverChanged(object sender, EventArgs e)
         {
-            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)
+            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;
             }
         }
 
@@ -229,6 +218,11 @@ namespace unison
                 SnapcastText.Text = unison.Resources.Resources.StartSnapcast;
         }
 
+        public void OnRadioBrowserConnected()
+        {
+            Radio.IsEnabled = true;
+        }
+
         public void UpdateButton(ref Border border, bool b)
         {
             border.Style = b ? (Style)Resources["SelectedButton"] : (Style)Resources["UnselectedButton"];

Views/Radios.xaml.cs

@@ -54,9 +54,6 @@ namespace unison
     {
         private RadioBrowserClient _radioBrowser;
         private MPDHandler _mpd;
-        private bool _connected = true;
-
-        public bool IsConnected() => _connected;
 
         public Radios()
         {
@@ -72,8 +69,11 @@ namespace unison
                 Debug.WriteLine("Exception while connecting to RadioBrowser: " + e.Message);
                 return;
             }
-
-            _connected = true;
+            Application.Current.Dispatcher.Invoke(() =>
+            {
+                MainWindow MainWin = (MainWindow)Application.Current.MainWindow;
+                MainWin.OnRadioBrowserConnected();
+            });
         }
 
         public async void Initialize()

Views/Settings.xaml

@@ -43,7 +43,7 @@
 
                                     <StackPanel Margin="0,5,0,0">
                                         <TextBlock Text="{x:Static properties:Resources.Settings_Password}" TextWrapping="Wrap" Margin="5,0,0,0"/>
-                                        <PasswordBox x:Name="MpdPassword" KeyDown="ConnectHandler" Width="250" Margin="10,2,0,0"/>
+                                        <PasswordBox x:Name="MpdPassword" Width="250" Margin="10,2,0,0"/>
                                         <TextBlock Text="{x:Static properties:Resources.Settings_ConnectionPasswordInfo}" TextWrapping="Wrap" Margin="10,5,0,0" MaxWidth="250" HorizontalAlignment="Left"/>
                                     </StackPanel>
 
@@ -52,6 +52,7 @@
                                         <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>

unison.csproj

@@ -11,8 +11,8 @@
     <Company />
     <Authors>Théo Marchal</Authors>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
-    <PackageProjectUrl>https://github.com/ZetaKebab/unison</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/ZetaKebab/unison</RepositoryUrl>
+    <PackageProjectUrl>https://git.n700.ovh/keb/unison</PackageProjectUrl>
+    <RepositoryUrl>https://git.n700.ovh/keb/unison</RepositoryUrl>
     <Copyright>Théo Marchal</Copyright>
     <PackageIconUrl />
   </PropertyGroup>
@@ -22,8 +22,6 @@
     <None Remove="Resources\icon-mini.ico" />
     <None Remove="Resources\nocover.png" />
     <None Remove="LICENSE" />
-    <None Remove="Resources\nothing.png" />
-    <None Remove="Resources\radio.png" />
     <None Include="LICENSE">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
@@ -40,12 +38,6 @@
     <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>