From 6e4ed82211c91f195da43e87861537b2b979381a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Marchal?= <me@theomarchal.com>
Date: Mon, 4 Oct 2021 19:20:41 +0200
Subject: [PATCH] Mute shortcut

---
 Handlers/HotkeyHandler.cs       |  5 +++++
 Handlers/MPDHandler.cs          | 16 ++++++++++++++++
 Resources/Resources.Designer.cs |  9 +++++++++
 Resources/Resources.fr-FR.resx  |  3 +++
 Resources/Resources.resx        |  3 +++
 Views/Settings.xaml             |  7 +++++--
 6 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/Handlers/HotkeyHandler.cs b/Handlers/HotkeyHandler.cs
index fcf1e1c..c0680a2 100644
--- a/Handlers/HotkeyHandler.cs
+++ b/Handlers/HotkeyHandler.cs
@@ -28,6 +28,7 @@ namespace unison
         private const uint VK_MEDIA_PLAY_PAUSE = 0xB3;
         private const uint VK_VOLUME_UP = 0xAF;
         private const uint VK_VOLUME_DOWN = 0xAE;
+        private const uint VK_VOLUME_MUTE = 0xAD;
         private const uint VK_ENTER = 0x0D;
 
         private MainWindow _appWindow;
@@ -54,6 +55,7 @@ namespace unison
                 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);
             }
         }
@@ -79,6 +81,9 @@ namespace unison
                     case VK_VOLUME_UP:
                         _mpd.VolumeUp();
                         break;
+                    case VK_VOLUME_MUTE:
+                        _mpd.VolumeMute();
+                        break;
                     case VK_MEDIA_PLAY_PAUSE:
                         _mpd.PlayPause();
                         break;
diff --git a/Handlers/MPDHandler.cs b/Handlers/MPDHandler.cs
index 367ab87..676cf81 100644
--- a/Handlers/MPDHandler.cs
+++ b/Handlers/MPDHandler.cs
@@ -25,6 +25,7 @@ namespace unison
         private bool _connected;
         public string _version;
         private int _currentVolume;
+        private int _previousVolume;
         private bool _currentRandom;
         private bool _currentRepeat;
         private bool _currentSingle;
@@ -449,6 +450,21 @@ namespace unison
             SetVolume(_currentVolume);
         }
 
+        public void VolumeMute()
+        {
+            if (_currentVolume == 0)
+            {
+                _currentVolume = _previousVolume;
+                _previousVolume = 0;
+            }
+            else
+            {
+                _previousVolume = _currentVolume;
+                _currentVolume = 0;
+            }
+            SetVolume(_currentVolume);
+        }
+
         public void ClearQueue() => SendCommand(new ClearCommand());
         public void PlayCommand() => SendCommand(new PlayCommand(0));
 
diff --git a/Resources/Resources.Designer.cs b/Resources/Resources.Designer.cs
index 68d218a..d6a0eac 100644
--- a/Resources/Resources.Designer.cs
+++ b/Resources/Resources.Designer.cs
@@ -420,6 +420,15 @@ namespace unison.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Volume mute.
+        /// </summary>
+        public static string Settings_VolumeMute {
+            get {
+                return ResourceManager.GetString("Settings_VolumeMute", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Volume offset.
         /// </summary>
diff --git a/Resources/Resources.fr-FR.resx b/Resources/Resources.fr-FR.resx
index 69c75f9..b967c6d 100644
--- a/Resources/Resources.fr-FR.resx
+++ b/Resources/Resources.fr-FR.resx
@@ -237,6 +237,9 @@
   <data name="Settings_VolumeDown" xml:space="preserve">
     <value>Baisse de volume</value>
   </data>
+  <data name="Settings_VolumeMute" xml:space="preserve">
+    <value>Volume en sourdine</value>
+  </data>
   <data name="Settings_VolumeOffset" xml:space="preserve">
     <value>Écart de volume</value>
   </data>
diff --git a/Resources/Resources.resx b/Resources/Resources.resx
index 43a6175..fa872bb 100644
--- a/Resources/Resources.resx
+++ b/Resources/Resources.resx
@@ -237,6 +237,9 @@
   <data name="Settings_VolumeDown" xml:space="preserve">
     <value>Volume down</value>
   </data>
+  <data name="Settings_VolumeMute" xml:space="preserve">
+    <value>Volume mute</value>
+  </data>
   <data name="Settings_VolumeOffset" xml:space="preserve">
     <value>Volume offset</value>
   </data>
diff --git a/Views/Settings.xaml b/Views/Settings.xaml
index 183c05e..d688dce 100644
--- a/Views/Settings.xaml
+++ b/Views/Settings.xaml
@@ -107,20 +107,23 @@
                                             <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_PreviousTrack}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="1" Margin="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_VolumeUp}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="3" Margin="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_ShowWindow}" 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="5" Margin="1"/>
+                                        <TextBlock Text="{x:Static properties:Resources.Settings_ShowWindow}" TextWrapping="Wrap" Grid.Column="0" Grid.Row="6" Margin="1"/>
 
                                         <TextBlock Text="ctrl + media_next" TextWrapping="Wrap" Grid.Column="1" Grid.Row="0" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
                                         <TextBlock Text="ctrl + media_prev" TextWrapping="Wrap" Grid.Column="1" Grid.Row="1" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
                                         <TextBlock Text="ctrl + media_play" TextWrapping="Wrap" Grid.Column="1" Grid.Row="2" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
                                         <TextBlock Text="ctrl + volume_up" TextWrapping="Wrap" Grid.Column="1" Grid.Row="3" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
                                         <TextBlock Text="ctrl + volume_down" TextWrapping="Wrap" Grid.Column="1" Grid.Row="4" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
-                                        <TextBlock Text="ctrl + alt + enter" TextWrapping="Wrap" Grid.Column="1" Grid.Row="5" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
+                                        <TextBlock Text="ctrl + volume_mute" TextWrapping="Wrap" Grid.Column="1" Grid.Row="5" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
+                                        <TextBlock Text="ctrl + alt + enter" TextWrapping="Wrap" Grid.Column="1" Grid.Row="6" Margin="1" HorizontalAlignment="Right" FontWeight="Bold"/>
                                     </Grid>
                                 </StackPanel>
                             </Grid>