aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.Common/Configuration/ConfigurationFileFormat.cs')
-rw-r--r--Ryujinx.Common/Configuration/ConfigurationFileFormat.cs13
1 files changed, 3 insertions, 10 deletions
diff --git a/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs b/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs
index ff5a67c4..09252b77 100644
--- a/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs
+++ b/Ryujinx.Common/Configuration/ConfigurationFileFormat.cs
@@ -4,9 +4,7 @@ using Ryujinx.Common.Configuration.Hid;
using Ryujinx.Common.Logging;
using Ryujinx.Common.Utilities;
using Ryujinx.Configuration.System;
-using Ryujinx.Configuration.Hid;
using Ryujinx.Configuration.Ui;
-using Ryujinx.UI.Input;
namespace Ryujinx.Configuration
{
@@ -15,7 +13,7 @@ namespace Ryujinx.Configuration
/// <summary>
/// The current version of the file format
/// </summary>
- public const int CurrentVersion = 5;
+ public const int CurrentVersion = 6;
public int Version { get; set; }
@@ -130,11 +128,6 @@ namespace Ryujinx.Configuration
public bool IgnoreMissingServices { get; set; }
/// <summary>
- /// The primary controller's type
- /// </summary>
- public ControllerType ControllerType { get; set; }
-
- /// <summary>
/// Used to toggle columns in the GUI
/// </summary>
public GuiColumns GuiColumns { get; set; }
@@ -162,12 +155,12 @@ namespace Ryujinx.Configuration
/// <summary>
/// Keyboard control bindings
/// </summary>
- public NpadKeyboard KeyboardControls { get; set; }
+ public List<KeyboardConfig> KeyboardConfig { get; set; }
/// <summary>
/// Controller control bindings
/// </summary>
- public NpadController JoystickControls { get; set; }
+ public List<ControllerConfig> ControllerConfig { get; set; }
/// <summary>
/// Loads a configuration file from disk