Merge pull request #211 from anttitn/3.x

Add setting to disable auto refresh game controllers

Author: csutorasa

XOutput/Resources/Languages/English.json

@@ -16,6 +16,7 @@
   "DiagnosticsMenu": "Diagnostics",
   "DirectInput": "DirectInput",
   "Disable": "Disable",
+  "DisableAutoRefresh": "Disable automatic device status detection",
   "Edit": "Edit",
   "EmulationStarted": "{0} is emulated as controller #{1}.",
   "EmulationStopped": "{0} is no longer emulated.",

XOutput/Tools/Settings.cs

@@ -34,6 +34,7 @@ public static Settings Load(string filePath)
         public bool CloseToTray { get; set; }
         public bool ShowAll { get; set; }
         public bool HidGuardianEnabled { get; set; }
+        public bool DisableAutoRefresh { get; set; }
         public string Language
         {
             get => LanguageManager.Instance.Language;

XOutput/UI/Windows/MainWindowViewModel.cs

@@ -40,9 +40,6 @@ public MainWindowViewModel(MainWindowModel model, Dispatcher dispatcher, HidGuar
         {
             this.dispatcher = dispatcher;
             this.hidGuardianManager = hidGuardianManager;
-            timer.Interval = TimeSpan.FromMilliseconds(5000);
-            timer.Tick += (object sender1, EventArgs e1) => { RefreshGameControllers(); };
-            timer.Start();
         }
 
         public void Dispose()
@@ -147,6 +144,10 @@ public void Initialize(Action<string> log)
             Model.Settings = settings;
             RefreshGameControllers();
 
+            timer.Interval = TimeSpan.FromMilliseconds(5000);
+            timer.Tick += (object sender1, EventArgs e1) => { if (!settings.DisableAutoRefresh) { RefreshGameControllers(); } };
+            timer.Start();
+
             logger.Debug("Creating keyboard controller");
             Devices.Input.Keyboard.Keyboard keyboard = new Devices.Input.Keyboard.Keyboard();
             settings.GetOrCreateInputConfiguration(keyboard.ToString(), keyboard.InputConfiguration);

XOutput/UI/Windows/SettingsModel.cs

@@ -69,6 +69,19 @@ public bool HidGuardianEnabled
             }
         }
 
+        public bool DisableAutoRefresh
+        {
+            get => settings.DisableAutoRefresh;
+            set
+            {
+                if (settings.DisableAutoRefresh != value)
+                {
+                    settings.DisableAutoRefresh = value;
+                    OnPropertyChanged(nameof(DisableAutoRefresh));
+                }
+            }
+        }
+
         public SettingsModel(RegistryModifier registryModifier, Settings settings)
         {
             this.registryModifier = registryModifier;

XOutput/UI/Windows/SettingsWindow.xaml

@@ -17,6 +17,7 @@
             <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
             <RowDefinition Height="*"/>
+            <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
         <Label Grid.Column="0" Grid.Row="0" VerticalAlignment="Center" Content="{Binding LanguageModel.Data, Converter={StaticResource LanguageConverter}, ConverterParameter='Language'}"/>
         <ComboBox Grid.Column="1" Grid.Row="0" HorizontalAlignment="Left" Width="200" Height="25" ItemsSource="{Binding Model.Languages}" SelectedItem="{Binding Model.SelectedLanguage}"/>
@@ -26,5 +27,7 @@
         <CheckBox Grid.Column="1" Grid.Row="2" HorizontalAlignment="Left" Width="200" VerticalAlignment="Center" IsChecked="{Binding Model.RunAtStartup}"/>
         <Label Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" Content="{Binding LanguageModel.Data, Converter={StaticResource LanguageConverter}, ConverterParameter='HidGuardianEnabled'}"/>
         <CheckBox Grid.Column="1" Grid.Row="3" Width="200" VerticalAlignment="Center" IsChecked="{Binding Model.HidGuardianEnabled}"/>
+        <Label Grid.Column="0" Grid.Row="4" VerticalAlignment="Center" Content="{Binding LanguageModel.Data, Converter={StaticResource LanguageConverter}, ConverterParameter='DisableAutoRefresh'}"/>
+        <CheckBox Grid.Column="1" Grid.Row="4" Width="200" VerticalAlignment="Center" IsChecked="{Binding Model.DisableAutoRefresh}"/>
     </Grid>
 </Window>