aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Common/Configuration/Hid
diff options
context:
space:
mode:
authorThog <me@thog.eu>2020-04-30 14:07:41 +0200
committerGitHub <noreply@github.com>2020-04-30 14:07:41 +0200
commit886e42fb19b5d69a6a256e20bd1b948124f790a3 (patch)
tree8648c0a8b3cb82032e9cc9adae411cc8d1dbc8d3 /Ryujinx.Common/Configuration/Hid
parent7ab3fccd4d13bf3ed07a7fa207cfee61b43c56f3 (diff)
Use the official JSON parser (#1151)
This remove Utf8son and JsonPrettyPrinter dependencies. NOTE: the standard JSON parser doesn't support configurable indentation, as a result, all the pretty printed JSON are indented with 2 spaces.
Diffstat (limited to 'Ryujinx.Common/Configuration/Hid')
-rw-r--r--Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs2
-rw-r--r--Ryujinx.Common/Configuration/Hid/NpadController.cs12
-rw-r--r--Ryujinx.Common/Configuration/Hid/NpadControllerLeft.cs18
-rw-r--r--Ryujinx.Common/Configuration/Hid/NpadControllerRight.cs18
-rw-r--r--Ryujinx.Common/Configuration/Hid/NpadKeyboard.cs6
-rw-r--r--Ryujinx.Common/Configuration/Hid/NpadKeyboardLeft.cs24
-rw-r--r--Ryujinx.Common/Configuration/Hid/NpadKeyboardRight.cs24
7 files changed, 52 insertions, 52 deletions
diff --git a/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs b/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs
index 1d0b0504..30cc8d84 100644
--- a/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs
+++ b/Ryujinx.Common/Configuration/Hid/KeyboardHotkeys.cs
@@ -2,6 +2,6 @@
{
public struct KeyboardHotkeys
{
- public Key ToggleVsync;
+ public Key ToggleVsync { get; set; }
}
}
diff --git a/Ryujinx.Common/Configuration/Hid/NpadController.cs b/Ryujinx.Common/Configuration/Hid/NpadController.cs
index f00865d5..94b985d5 100644
--- a/Ryujinx.Common/Configuration/Hid/NpadController.cs
+++ b/Ryujinx.Common/Configuration/Hid/NpadController.cs
@@ -5,31 +5,31 @@
/// <summary>
/// Enables or disables controller support
/// </summary>
- public bool Enabled;
+ public bool Enabled { get; set; }
/// <summary>
/// Controller Device Index
/// </summary>
- public int Index;
+ public int Index { get; set; }
/// <summary>
/// Controller Analog Stick Deadzone
/// </summary>
- public float Deadzone;
+ public float Deadzone { get; set; }
/// <summary>
/// Controller Trigger Threshold
/// </summary>
- public float TriggerThreshold;
+ public float TriggerThreshold { get; set; }
/// <summary>
/// Left JoyCon Controller Bindings
/// </summary>
- public NpadControllerLeft LeftJoycon;
+ public NpadControllerLeft LeftJoycon { get; set; }
/// <summary>
/// Right JoyCon Controller Bindings
/// </summary>
- public NpadControllerRight RightJoycon;
+ public NpadControllerRight RightJoycon { get; set; }
}
}
diff --git a/Ryujinx.Common/Configuration/Hid/NpadControllerLeft.cs b/Ryujinx.Common/Configuration/Hid/NpadControllerLeft.cs
index 54ac0f03..c221b5e8 100644
--- a/Ryujinx.Common/Configuration/Hid/NpadControllerLeft.cs
+++ b/Ryujinx.Common/Configuration/Hid/NpadControllerLeft.cs
@@ -2,14 +2,14 @@
{
public struct NpadControllerLeft
{
- public ControllerInputId Stick;
- public ControllerInputId StickButton;
- public ControllerInputId ButtonMinus;
- public ControllerInputId ButtonL;
- public ControllerInputId ButtonZl;
- public ControllerInputId DPadUp;
- public ControllerInputId DPadDown;
- public ControllerInputId DPadLeft;
- public ControllerInputId DPadRight;
+ public ControllerInputId Stick { get; set; }
+ public ControllerInputId StickButton { get; set; }
+ public ControllerInputId ButtonMinus { get; set; }
+ public ControllerInputId ButtonL { get; set; }
+ public ControllerInputId ButtonZl { get; set; }
+ public ControllerInputId DPadUp { get; set; }
+ public ControllerInputId DPadDown { get; set; }
+ public ControllerInputId DPadLeft { get; set; }
+ public ControllerInputId DPadRight { get; set; }
}
}
diff --git a/Ryujinx.Common/Configuration/Hid/NpadControllerRight.cs b/Ryujinx.Common/Configuration/Hid/NpadControllerRight.cs
index 315136d9..f52f6f16 100644
--- a/Ryujinx.Common/Configuration/Hid/NpadControllerRight.cs
+++ b/Ryujinx.Common/Configuration/Hid/NpadControllerRight.cs
@@ -2,14 +2,14 @@
{
public struct NpadControllerRight
{
- public ControllerInputId Stick;
- public ControllerInputId StickButton;
- public ControllerInputId ButtonA;
- public ControllerInputId ButtonB;
- public ControllerInputId ButtonX;
- public ControllerInputId ButtonY;
- public ControllerInputId ButtonPlus;
- public ControllerInputId ButtonR;
- public ControllerInputId ButtonZr;
+ public ControllerInputId Stick { get; set; }
+ public ControllerInputId StickButton { get; set; }
+ public ControllerInputId ButtonA { get; set; }
+ public ControllerInputId ButtonB { get; set; }
+ public ControllerInputId ButtonX { get; set; }
+ public ControllerInputId ButtonY { get; set; }
+ public ControllerInputId ButtonPlus { get; set; }
+ public ControllerInputId ButtonR { get; set; }
+ public ControllerInputId ButtonZr { get; set; }
}
}
diff --git a/Ryujinx.Common/Configuration/Hid/NpadKeyboard.cs b/Ryujinx.Common/Configuration/Hid/NpadKeyboard.cs
index 911f5119..5ae82756 100644
--- a/Ryujinx.Common/Configuration/Hid/NpadKeyboard.cs
+++ b/Ryujinx.Common/Configuration/Hid/NpadKeyboard.cs
@@ -5,16 +5,16 @@ namespace Ryujinx.UI.Input
/// <summary>
/// Left JoyCon Keyboard Bindings
/// </summary>
- public Configuration.Hid.NpadKeyboardLeft LeftJoycon;
+ public Configuration.Hid.NpadKeyboardLeft LeftJoycon { get; set; }
/// <summary>
/// Right JoyCon Keyboard Bindings
/// </summary>
- public Configuration.Hid.NpadKeyboardRight RightJoycon;
+ public Configuration.Hid.NpadKeyboardRight RightJoycon { get; set; }
/// <summary>
/// Hotkey Keyboard Bindings
/// </summary>
- public Configuration.Hid.KeyboardHotkeys Hotkeys;
+ public Configuration.Hid.KeyboardHotkeys Hotkeys { get; set; }
}
}
diff --git a/Ryujinx.Common/Configuration/Hid/NpadKeyboardLeft.cs b/Ryujinx.Common/Configuration/Hid/NpadKeyboardLeft.cs
index 799cdfdb..4a61d932 100644
--- a/Ryujinx.Common/Configuration/Hid/NpadKeyboardLeft.cs
+++ b/Ryujinx.Common/Configuration/Hid/NpadKeyboardLeft.cs
@@ -2,17 +2,17 @@
{
public struct NpadKeyboardLeft
{
- public Key StickUp;
- public Key StickDown;
- public Key StickLeft;
- public Key StickRight;
- public Key StickButton;
- public Key DPadUp;
- public Key DPadDown;
- public Key DPadLeft;
- public Key DPadRight;
- public Key ButtonMinus;
- public Key ButtonL;
- public Key ButtonZl;
+ public Key StickUp { get; set; }
+ public Key StickDown { get; set; }
+ public Key StickLeft { get; set; }
+ public Key StickRight { get; set; }
+ public Key StickButton { get; set; }
+ public Key DPadUp { get; set; }
+ public Key DPadDown { get; set; }
+ public Key DPadLeft { get; set; }
+ public Key DPadRight { get; set; }
+ public Key ButtonMinus { get; set; }
+ public Key ButtonL { get; set; }
+ public Key ButtonZl { get; set; }
}
}
diff --git a/Ryujinx.Common/Configuration/Hid/NpadKeyboardRight.cs b/Ryujinx.Common/Configuration/Hid/NpadKeyboardRight.cs
index 311504bb..0677b573 100644
--- a/Ryujinx.Common/Configuration/Hid/NpadKeyboardRight.cs
+++ b/Ryujinx.Common/Configuration/Hid/NpadKeyboardRight.cs
@@ -2,17 +2,17 @@
{
public struct NpadKeyboardRight
{
- public Key StickUp;
- public Key StickDown;
- public Key StickLeft;
- public Key StickRight;
- public Key StickButton;
- public Key ButtonA;
- public Key ButtonB;
- public Key ButtonX;
- public Key ButtonY;
- public Key ButtonPlus;
- public Key ButtonR;
- public Key ButtonZr;
+ public Key StickUp { get; set; }
+ public Key StickDown { get; set; }
+ public Key StickLeft { get; set; }
+ public Key StickRight { get; set; }
+ public Key StickButton { get; set; }
+ public Key ButtonA { get; set; }
+ public Key ButtonB { get; set; }
+ public Key ButtonX { get; set; }
+ public Key ButtonY { get; set; }
+ public Key ButtonPlus { get; set; }
+ public Key ButtonR { get; set; }
+ public Key ButtonZr { get; set; }
}
}