summaryrefslogtreecommitdiff
path: root/src/input_common/drivers/sdl_driver.cpp
diff options
context:
space:
mode:
authorGravatar Morph2022-02-05 00:40:28 -0500
committerGravatar Morph2022-02-05 13:18:41 -0500
commitcb30fe50cd074fe05dd1d6e4b0d58116d3d98489 (patch)
tree58450d743d317369266bbbea44734725d8b83ea6 /src/input_common/drivers/sdl_driver.cpp
parentcommon: Implement NewUUID (diff)
downloadyuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.tar.gz
yuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.tar.xz
yuzu-cb30fe50cd074fe05dd1d6e4b0d58116d3d98489.zip
input/hid: Migrate to the new UUID implementation
Diffstat (limited to 'src/input_common/drivers/sdl_driver.cpp')
-rw-r--r--src/input_common/drivers/sdl_driver.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp
index b031a8523..b9a8317d4 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -120,7 +120,7 @@ public:
120 */ 120 */
121 const PadIdentifier GetPadIdentifier() const { 121 const PadIdentifier GetPadIdentifier() const {
122 return { 122 return {
123 .guid = Common::UUID{guid}, 123 .guid = Common::NewUUID{guid},
124 .port = static_cast<std::size_t>(port), 124 .port = static_cast<std::size_t>(port),
125 .pad = 0, 125 .pad = 0,
126 }; 126 };
@@ -502,7 +502,7 @@ std::vector<Common::ParamPackage> SDLDriver::GetInputDevices() const {
502Common::Input::VibrationError SDLDriver::SetRumble( 502Common::Input::VibrationError SDLDriver::SetRumble(
503 const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) { 503 const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) {
504 const auto joystick = 504 const auto joystick =
505 GetSDLJoystickByGUID(identifier.guid.Format(), static_cast<int>(identifier.port)); 505 GetSDLJoystickByGUID(identifier.guid.RawString(), static_cast<int>(identifier.port));
506 const auto process_amplitude_exp = [](f32 amplitude, f32 factor) { 506 const auto process_amplitude_exp = [](f32 amplitude, f32 factor) {
507 return (amplitude + std::pow(amplitude, factor)) * 0.5f * 0xFFFF; 507 return (amplitude + std::pow(amplitude, factor)) * 0.5f * 0xFFFF;
508 }; 508 };
@@ -599,7 +599,7 @@ Common::ParamPackage SDLDriver::BuildParamPackageForAnalog(PadIdentifier identif
599 Common::ParamPackage params; 599 Common::ParamPackage params;
600 params.Set("engine", GetEngineName()); 600 params.Set("engine", GetEngineName());
601 params.Set("port", static_cast<int>(identifier.port)); 601 params.Set("port", static_cast<int>(identifier.port));
602 params.Set("guid", identifier.guid.Format()); 602 params.Set("guid", identifier.guid.RawString());
603 params.Set("axis_x", axis_x); 603 params.Set("axis_x", axis_x);
604 params.Set("axis_y", axis_y); 604 params.Set("axis_y", axis_y);
605 params.Set("offset_x", offset_x); 605 params.Set("offset_x", offset_x);