Hide windows when clicking corresponding buttons if they were visible

.NET 6.0 => 8.0
Snapcast 0.27 => 0.31
Autoupdater.NET.Official 1.8.0 => 1.9.2
Hardcodet.NotifyIcon.Wpf 1.1.0 => 2.0.1
MpcNET 1.4.0 => 1.6.6

App.config

@@ -23,7 +23,7 @@
                 <value>False</value>
             </setting>
             <setting name="snapcast_path" serializeAs="String">
-                <value>snapclient_0.26.0-1_win64</value>
+                <value>snapcast_0.31</value>
             </setting>
             <setting name="snapcast_port" serializeAs="String">
                 <value>1704</value>

Handlers/ShuffleHandler.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
@@ -34,8 +35,9 @@ namespace unison
 
             SongList.Clear();
 
-            int song = _mpd.GetStats().Songs;
-            IEnumerable<IMpdFile> response = await _mpd.SafelySendCommandAsync(new SearchCommand(filter, 0, song + 1));
+            int songTotal = _mpd.GetStats().Songs;
+
+            IEnumerable<IMpdFile> response = await _mpd.SafelySendCommandAsync(new SearchCommand(filter, 0, songTotal + 1));
             foreach (IMpdFile file in response)
                 SongList.Add(file.Path);
         }
@@ -45,7 +47,7 @@ namespace unison
             if (token.IsCancellationRequested)
                 return;
 
-            int AddedSongs = 0;
+            int addedSongs = 0;
 
             var commandList = new CommandList();
             int songTotal = _mpd.GetStats().Songs;
@@ -54,13 +56,13 @@ namespace unison
             {
                 int song = new Random().Next(0, songTotal - 1);
                 commandList.Add(new SearchAddCommand(new FilterTag(MpdTags.Title, "", FilterOperator.Contains), song, song + 1));
-                AddedSongs++;
-
-                // play if stopped or unknown state (no queue managing at the moment, so mandatory)
-                if (i == 0 && (_mpd.GetStatus().State != MpdState.Play && _mpd.GetStatus().State != MpdState.Pause))
-                    commandList.Add(new PlayCommand(0));
+                addedSongs++;
             }
 
+            // play if stopped or unknown state (no queue managing at the moment, so mandatory)
+            if ((_mpd.GetStatus().State != MpdState.Play && _mpd.GetStatus().State != MpdState.Pause))
+                commandList.Add(new PlayCommand(0));
+
             await _mpd.SafelySendCommandAsync(commandList);
         }
 

Installer/unison.iss

@@ -1,6 +1,6 @@
 #define Name "unison"
 #define Version "1.4"
-#define Snapcast "snapclient_0.26.0-1_win64"
+#define Snapcast "snapcast_0.31"
 #define Publisher "Th<54>o Marchal"
 #define URL "https://github.com/ZetaKebab/unison"
 #define ExeName "unison.exe"

LICENSE

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

@@ -12,7 +12,7 @@ namespace unison.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -85,7 +85,7 @@ namespace unison.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("snapclient_0.26.0-1_win64")]
+        [global::System.Configuration.DefaultSettingValueAttribute("snapcast_0.31")]
         public string snapcast_path {
             get {
                 return ((string)(this["snapcast_path"]));

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.26.0-1_win64</Value>
+      <Value Profile="(Default)">snapcast_0.31</Value>
     </Setting>
     <Setting Name="snapcast_port" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">1704</Value>

Resources/Resources.Designer.cs

@@ -60,6 +60,15 @@ namespace unison.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Clear queue.
+        /// </summary>
+        public static string Clear_Queue {
+            get {
+                return ResourceManager.GetString("Clear_Queue", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Database.
         /// </summary>
@@ -213,6 +222,24 @@ namespace unison.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Play queue.
+        /// </summary>
+        public static string Play_Queue {
+            get {
+                return ResourceManager.GetString("Play_Queue", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Queue management.
+        /// </summary>
+        public static string Queue_Management {
+            get {
+                return ResourceManager.GetString("Queue_Management", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Country.
         /// </summary>

Resources/Resources.es-ES.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Clear_Queue" xml:space="preserve">
+    <value>Borrar cola</value>
+  </data>
   <data name="Database" xml:space="preserve">
     <value>Base de datos</value>
   </data>
@@ -168,6 +171,12 @@
   <data name="Operator_IsNot" xml:space="preserve">
     <value>no es</value>
   </data>
+  <data name="Play_Queue" xml:space="preserve">
+    <value>Reproducir cola</value>
+  </data>
+  <data name="Queue_Management" xml:space="preserve">
+    <value>Gestión de cola</value>
+  </data>
   <data name="Radios" xml:space="preserve">
     <value>Radios</value>
   </data>

Resources/Resources.fr-FR.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Clear_Queue" xml:space="preserve">
+    <value>Effacer la file</value>
+  </data>
   <data name="Database" xml:space="preserve">
     <value>Base de donnée</value>
   </data>
@@ -168,6 +171,12 @@
   <data name="Operator_IsNot" xml:space="preserve">
     <value>n'est pas</value>
   </data>
+  <data name="Play_Queue" xml:space="preserve">
+    <value>Jouer la file</value>
+  </data>
+  <data name="Queue_Management" xml:space="preserve">
+    <value>Gestion de file</value>
+  </data>
   <data name="Radios" xml:space="preserve">
     <value>Radios</value>
   </data>

Resources/Resources.resx

@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="Clear_Queue" xml:space="preserve">
+    <value>Clear queue</value>
+  </data>
   <data name="Database" xml:space="preserve">
     <value>Database</value>
   </data>
@@ -168,6 +171,12 @@
   <data name="Operator_IsNot" xml:space="preserve">
     <value>is not</value>
   </data>
+  <data name="Play_Queue" xml:space="preserve">
+    <value>Play queue</value>
+  </data>
+  <data name="Queue_Management" xml:space="preserve">
+    <value>Queue management</value>
+  </data>
   <data name="Radios" xml:space="preserve">
     <value>Radios</value>
   </data>

Resources/Resources.xaml

@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib" xmlns:sys="clr-namespace:System;assembly=System.Runtime">
 
-    <system:String x:Key="snapcastPath">snapclient_0.26.0-1_win64</system:String>
+    <system:String x:Key="snapcastPath">snapcast_0.31</system:String>
     <system:String x:Key="snapcastPort">1704</system:String>
 
     <system:String x:Key="playButton">&#xedb4;</system:String>

Views/MainWindow.xaml.cs

@@ -257,8 +257,19 @@ namespace unison
             snapcast.LaunchOrExit();
         }
 
+        private bool _radiosVisible = false;
+        private bool _shuffleVisible = false;
+        private bool _settingsVisible = false;
+
         public void Radios_Clicked(object sender, RoutedEventArgs e)
         {
+            if (_radiosVisible)
+            {
+                _radiosVisible = false;
+                _radiosWin.Hide();
+                return;
+            }
+            _radiosVisible = true;
             _radiosWin.Show();
             _radiosWin.Activate();
 
@@ -268,6 +279,13 @@ namespace unison
 
         public void Shuffle_Clicked(object sender, RoutedEventArgs e)
         {
+            if (_shuffleVisible)
+            {
+                _shuffleVisible = false;
+                _shuffleWin.Hide();
+                return;
+            }
+            _shuffleVisible = true;
             _shuffleWin.Show();
             _shuffleWin.Activate();
 
@@ -277,6 +295,13 @@ namespace unison
 
         public void Settings_Clicked(object sender, RoutedEventArgs e)
         {
+            if (_settingsVisible)
+            {
+                _settingsVisible = false;
+                _settingsWin.Hide();
+                return;
+            }
+            _settingsVisible = true;
             _settingsWin.Show();
             _settingsWin.Activate();
 

Views/Shuffle.xaml

@@ -81,7 +81,7 @@
                         <GroupBox.Header>
                             <TextBlock>
                             <emoji:EmojiInline Text="➕"/>
-                            <Run Text="{x:Static properties:Resources.Shuffle_Queue}"/>
+                            <Run Text="{x:Static properties:Resources.Queue_Management}"/>
                             </TextBlock>
                         </GroupBox.Header>
                         <StackPanel Orientation="Vertical" Margin="5,5,5,0">
@@ -96,6 +96,11 @@
                                 </TextBlock>
                                 <TextBlock x:Name="SearchStatus2" Text="{x:Static properties:Resources.Shuffle_ButtonMessage3}" Margin="3,3,0,0" FontStyle="Italic" Visibility="Collapsed"/>
                             </StackPanel>
+
+                            <StackPanel Orientation="Horizontal" Margin="0,15,0,0">
+                                <Button Content="{x:Static properties:Resources.Clear_Queue}" Click="ClearQueue_Clicked" Padding="5, 2" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}"/>
+                                <Button Content="{x:Static properties:Resources.Play_Queue}" Click="StartQueue_Clicked" Padding="5, 2" Margin="5, 0" HorizontalAlignment="Left" FocusVisualStyle="{x:Null}"/>
+                            </StackPanel>
                         </StackPanel>
                     </GroupBox>
                     

Views/Shuffle.xaml.cs

@@ -55,7 +55,7 @@ namespace unison
             if (token.IsCancellationRequested)
                 return;
 
-            List<string> Response = await _mpd.SafelySendCommandAsync(new ListCommand(MpdTags.Genre, null, null));
+            List<string> Response = await _mpd.SafelySendCommandAsync(new ListCommand(MpdTags.Genre, null, null, null));
 
             if (Response == null)
                 return;
@@ -375,6 +375,16 @@ namespace unison
             AddToQueue();
         }
 
+        public void ClearQueue_Clicked(object sender, RoutedEventArgs e)
+        {
+            _mpd.ClearQueue();
+        }
+
+        public void StartQueue_Clicked(object sender, RoutedEventArgs e)
+        {
+            _mpd.PlayCommand();
+        }
+
         public bool GetContinuous()
         {
             return _continuous;

unison.csproj

@@ -2,12 +2,12 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Resources\icon-full.ico</ApplicationIcon>
     <Win32Resource></Win32Resource>
     <StartupObject>unison.App</StartupObject>
-    <Version>1.4</Version>
+    <Version>1.4-dev</Version>
     <Company />
     <Authors>Théo Marchal</Authors>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
@@ -52,11 +52,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autoupdater.NET.Official" Version="1.7.6" />
+    <PackageReference Include="Autoupdater.NET.Official" Version="1.9.2" />
     <PackageReference Include="Emoji.Wpf" Version="0.3.4" />
-    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
-    <PackageReference Include="RadioBrowser" Version="0.6.1" />
-	<PackageReference Include="MpcNET" Version="1.4.0" />
+    <PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="2.0.1" />
+    <PackageReference Include="RadioBrowser" Version="0.7.0" />
+	<PackageReference Include="MpcNET" Version="1.6.6" />
   </ItemGroup>
 
   <ItemGroup>
@@ -90,25 +90,25 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Update="snapclient_0.26.0-1_win64\FLAC.dll">
+    <None Update="snapcast_0.31\FLAC.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="snapclient_0.26.0-1_win64\ogg.dll">
+    <None Update="snapcast_0.31\ogg.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="snapclient_0.26.0-1_win64\opus.dll">
+    <None Update="snapcast_0.31\opus.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="snapclient_0.26.0-1_win64\README.txt">
+    <None Update="snapcast_0.31\README.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="snapclient_0.26.0-1_win64\snapclient.exe">
+    <None Update="snapcast_0.31\snapclient.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="snapclient_0.26.0-1_win64\soxr.dll">
+    <None Update="snapcast_0.31\soxr.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="snapclient_0.26.0-1_win64\vorbis.dll">
+    <None Update="snapcast_0.31\vorbis.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>