Optional fix to prevent resetting an output device volume balance

G-Stas · Oct 24, 2022 · 6575197 · 6575197
1 parent 181cae3
commit 6575197
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 1 deletion.
diff --git a/Volumey/DataProvider/AppSettings.cs b/Volumey/DataProvider/AppSettings.cs
@@ -369,6 +369,9 @@ internal HotKey ForegroundVolumeDown
 				}
 			}
 
+			[OptionalField]
+			public bool PreventResettingVolumeBalance;
+
 			[OptionalField]
 			public List<SystemHotkey> RegisteredSystemHotkeys = new List<SystemHotkey>();
 

diff --git a/Volumey/Model/MasterSessionModel.cs b/Volumey/Model/MasterSessionModel.cs
@@ -225,11 +225,19 @@ private void OnHotkeyPressed(HotKey hotkey)
             {
                 if(hotkey.Equals(this.volumeUp))
                 {
+                    if(SettingsProvider.HotkeysSettings.PreventResettingVolumeBalance && this.IsMuted)
+                        this.SetMute(false, notify: false, ref GuidValue.Internal.Empty);
                     this.SetVolume(this.Volume + HotkeysControl.VolumeStep, notify:true, ref GuidValue.Internal.Empty);
                 }
                 else if(hotkey.Equals(this.volumeDown))
                 {
-                    this.SetVolume(this.Volume - HotkeysControl.VolumeStep, notify: true, ref GuidValue.Internal.Empty);
+                    int newValue = this.Volume - HotkeysControl.VolumeStep;
+                    if(SettingsProvider.HotkeysSettings.PreventResettingVolumeBalance && newValue <= 0)
+                    {
+                        this.SetMute(true, notify: true, ref GuidValue.Internal.Empty);
+                    }
+                    else
+                        this.SetVolume(newValue, notify: true, ref GuidValue.Internal.Empty);
                 }
             }
 

diff --git a/Volumey/Resources/Resources.en.resx b/Volumey/Resources/Resources.en.resx
@@ -253,4 +253,7 @@
   <data name="Settings_SelectedScreen" xml:space="preserve">
     <value>Screen to display</value>
   </data>
+  <data name="Settings_PreventBalanceReset" xml:space="preserve">
+    <value>Prevent resetting the volume balance by muting the device instead of setting the volume to 0</value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.resx b/Volumey/Resources/Resources.resx
@@ -210,4 +210,7 @@
   <data name="Settings_SelectedScreen" xml:space="preserve">
     <value></value>
   </data>
+  <data name="Settings_PreventBalanceReset" xml:space="preserve">
+    <value></value>
+  </data>
 </root>
diff --git a/Volumey/Resources/Resources.ru.resx b/Volumey/Resources/Resources.ru.resx
@@ -253,4 +253,7 @@
   <data name="Settings_SelectedScreen" xml:space="preserve">
     <value>Дисплей для отображения</value>
   </data>
+  <data name="Settings_PreventBalanceReset" xml:space="preserve">
+    <value>Предотвращать сброс баланса звука заглушая устройство вместо установки громкости на 0</value>
+  </data>
 </root>
diff --git a/Volumey/View/SettingsPage/DeviceVolumeHotkeysPage.xaml b/Volumey/View/SettingsPage/DeviceVolumeHotkeysPage.xaml
@@ -64,6 +64,10 @@
 				IsEnabled="{Binding MuteKey, Converter={StaticResource AnyPropertyIsNullToEnabledConverter}}">
 			</ui:ToggleSwitch>
 		</StackPanel>
+
+		<TextBlock Text="{lc:Localization Settings_PreventBalanceReset}"/>
+		<ui:ToggleSwitch IsOn="{Binding PreventResettingVolumeBalance}"/>
+
 		<TextBlock
 			Text="{Binding ErrorMessage}"
 			Foreground="Red"/>

diff --git a/Volumey/ViewModel/Settings/DeviceVolumeHotkeysViewModel.cs b/Volumey/ViewModel/Settings/DeviceVolumeHotkeysViewModel.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel;
+using System.Threading.Tasks;
 using log4net;
 using Volumey.Controls;
 using Volumey.DataProvider;
@@ -80,6 +81,22 @@ public bool MuteHotkeyRegistered
 				OnPropertyChanged();
 			}
 		}
+
+		private bool _preventResettingVolumeBalance;
+		public bool PreventResettingVolumeBalance
+		{
+			get => _preventResettingVolumeBalance;
+			set
+			{
+				_preventResettingVolumeBalance = value;
+				OnPropertyChanged();
+				if(SettingsProvider.HotkeysSettings.PreventResettingVolumeBalance != value)
+				{
+					SettingsProvider.HotkeysSettings.PreventResettingVolumeBalance = value;
+					_ = Task.Run(async () => { await SettingsProvider.SaveSettings(); });
+				}
+			}
+		}
 
 		private AudioProcessStateNotificationMediator _dMediator;
 		private AudioProcessStateNotificationMediator DeviceMediator
@@ -102,6 +119,7 @@ public DeviceVolumeHotkeysViewModel()
 			ErrorDictionary.LanguageChanged += () => this.SetErrorMessage(this.CurrentErrorType);
 
 			var hotkeysSettings = SettingsProvider.HotkeysSettings;
+			PreventResettingVolumeBalance = hotkeysSettings.PreventResettingVolumeBalance;
 			var anyHotkeysRegistered = false;
 
 			//set volume hotkeys if they are exist in settings