Merge pull request #7614 from jordan-woyak/windows-gaming-input

InputCommon: Add Windows.Gaming.Input to ControllerInterface.
dolphin-emu · Apr 4, 2022 · 085c86a · 085c86a
2 parents a4445fa + 566dfc1
commit 085c86a
Show file tree

Hide file tree

Showing 9 changed files with 724 additions and 4 deletions.
diff --git a/Source/Core/DolphinLib.vcxproj b/Source/Core/DolphinLib.vcxproj
@@ -27,6 +27,12 @@
       <Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="InputCommon\ControllerInterface\WGInput\WGInput.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="InputCommon\ControllerInterface\WGInput\WGInput.h" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />
 </Project>
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
@@ -94,6 +94,8 @@ if(WIN32)
     ControllerInterface/DInput/XInputFilter.h
     ControllerInterface/Win32/Win32.cpp
     ControllerInterface/Win32/Win32.h
+    ControllerInterface/WGInput/WGInput.cpp
+    ControllerInterface/WGInput/WGInput.h
     ControllerInterface/XInput/XInput.cpp
     ControllerInterface/XInput/XInput.h
     ControllerInterface/ForceFeedback/ForceFeedbackDevice.cpp

diff --git a/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h b/Source/Core/InputCommon/ControllerInterface/DInput/DInputJoystick.h
@@ -64,7 +64,7 @@ class Joystick : public ForceFeedback::ForceFeedbackDevice
 
   std::string GetName() const override;
   std::string GetSource() const override;
-  int GetSortPriority() const override { return -2; }
+  int GetSortPriority() const override { return -3; }
 
   bool IsValid() const final override;
 

diff --git a/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp b/Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp
@@ -136,7 +136,7 @@ class Device final : public Core::Device
   std::string GetSource() const final override;
   std::optional<int> GetPreferredId() const final override;
   // Always add these at the end, given their hotplug nature
-  int GetSortPriority() const override { return -4; }
+  int GetSortPriority() const override { return -5; }
 
 private:
   void ResetPadData();