From 0ccd62fd8856cf0f7cf5b7ec4c3cbb1c0d0932dd Mon Sep 17 00:00:00 2001
From: empathicqubit <32425208+empathicqubit@users.noreply.github.com>
Date: Sun, 22 Aug 2021 14:43:44 +0200
Subject: [PATCH] Bump WindowsInput version (#830)

---
 BetterJoyForCemu/BetterJoy.csproj | 4 ++--
 BetterJoyForCemu/Program.cs       | 8 ++++----
 BetterJoyForCemu/Reassign.cs      | 8 ++++----
 BetterJoyForCemu/packages.config  | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/BetterJoyForCemu/BetterJoy.csproj b/BetterJoyForCemu/BetterJoy.csproj
index 9f3f5d3..a915684 100644
--- a/BetterJoyForCemu/BetterJoy.csproj
+++ b/BetterJoyForCemu/BetterJoy.csproj
@@ -119,8 +119,8 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="WindowsInput, Version=6.1.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\WindowsInput.6.1.0\lib\net461\WindowsInput.dll</HintPath>
+    <Reference Include="WindowsInput, Version=6.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsInput.6.3.0\lib\net461\WindowsInput.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/BetterJoyForCemu/Program.cs b/BetterJoyForCemu/Program.cs
index 84bb4b6..c9f27e3 100644
--- a/BetterJoyForCemu/Program.cs
+++ b/BetterJoyForCemu/Program.cs
@@ -358,8 +358,8 @@ namespace BetterJoyForCemu {
 
         public static List<SController> thirdPartyCons = new List<SController>();
 
-        private static WindowsInput.EventSources.IKeyboardEventSource keyboard;
-        private static WindowsInput.EventSources.IMouseEventSource mouse;
+        private static WindowsInput.Events.Sources.IKeyboardEventSource keyboard;
+        private static WindowsInput.Events.Sources.IMouseEventSource mouse;
 
         public static void Start() {
             pid = Process.GetCurrentProcess().Id.ToString(); // get current process id for HidCerberus.Srv
@@ -442,7 +442,7 @@ namespace BetterJoyForCemu {
             form.console.AppendText("All systems go\r\n");
         }
 
-        private static void Mouse_MouseEvent(object sender, WindowsInput.EventSources.EventSourceEventArgs<WindowsInput.EventSources.MouseEvent> e) {
+        private static void Mouse_MouseEvent(object sender, WindowsInput.Events.Sources.EventSourceEventArgs<WindowsInput.Events.Sources.MouseEvent> e) {
             if (e.Data.ButtonDown != null) {
                 string res_val = Config.Value("reset_mouse");
                 if (res_val.StartsWith("mse_"))
@@ -465,7 +465,7 @@ namespace BetterJoyForCemu {
             }
         }
 
-        private static void Keyboard_KeyEvent(object sender, WindowsInput.EventSources.EventSourceEventArgs<WindowsInput.EventSources.KeyboardEvent> e) {
+        private static void Keyboard_KeyEvent(object sender, WindowsInput.Events.Sources.EventSourceEventArgs<WindowsInput.Events.Sources.KeyboardEvent> e) {
             if (e.Data.KeyDown != null) {
                 string res_val = Config.Value("reset_mouse");
                 if (res_val.StartsWith("key_"))
diff --git a/BetterJoyForCemu/Reassign.cs b/BetterJoyForCemu/Reassign.cs
index 8462678..afb0c54 100644
--- a/BetterJoyForCemu/Reassign.cs
+++ b/BetterJoyForCemu/Reassign.cs
@@ -11,8 +11,8 @@ using System.Windows.Forms;
 
 namespace BetterJoyForCemu {
     public partial class Reassign : Form {
-        private WindowsInput.EventSources.IKeyboardEventSource keyboard;
-        private WindowsInput.EventSources.IMouseEventSource mouse;
+        private WindowsInput.Events.Sources.IKeyboardEventSource keyboard;
+        private WindowsInput.Events.Sources.IMouseEventSource mouse;
 
         ContextMenuStrip menu_joy_buttons = new ContextMenuStrip();
 
@@ -73,7 +73,7 @@ namespace BetterJoyForCemu {
             mouse.MouseEvent += Mouse_MouseEvent;
         }
 
-        private void Mouse_MouseEvent(object sender, WindowsInput.EventSources.EventSourceEventArgs<WindowsInput.EventSources.MouseEvent> e) {
+        private void Mouse_MouseEvent(object sender, WindowsInput.Events.Sources.EventSourceEventArgs<WindowsInput.Events.Sources.MouseEvent> e) {
             if (curAssignment != null && e.Data.ButtonDown != null) {
                 Config.SetValue((string)curAssignment.Tag, "mse_" + ((int)e.Data.ButtonDown.Button));
                 AsyncPrettyName(curAssignment);
@@ -82,7 +82,7 @@ namespace BetterJoyForCemu {
             }
         }
 
-        private void Keyboard_KeyEvent(object sender, WindowsInput.EventSources.EventSourceEventArgs<WindowsInput.EventSources.KeyboardEvent> e) {
+        private void Keyboard_KeyEvent(object sender, WindowsInput.Events.Sources.EventSourceEventArgs<WindowsInput.Events.Sources.KeyboardEvent> e) {
             if (curAssignment != null && e.Data.KeyDown != null) {
                 Config.SetValue((string)curAssignment.Tag, "key_" + ((int)e.Data.KeyDown.Key));
                 AsyncPrettyName(curAssignment);
diff --git a/BetterJoyForCemu/packages.config b/BetterJoyForCemu/packages.config
index 9c32728..3d35a58 100644
--- a/BetterJoyForCemu/packages.config
+++ b/BetterJoyForCemu/packages.config
@@ -3,5 +3,5 @@
   <package id="Crc32.NET" version="1.2.0" targetFramework="net461" />
   <package id="JetBrains.Annotations" version="2020.1.0" targetFramework="net461" />
   <package id="Nefarius.ViGEm.Client" version="1.17.178" targetFramework="net461" />
-  <package id="WindowsInput" version="6.1.0" targetFramework="net461" />
+  <package id="WindowsInput" version="6.3.0" targetFramework="net461" />
 </packages>
\ No newline at end of file