diff options
Diffstat (limited to 'src/input_common/drivers/sdl_driver.cpp')
| -rw-r--r-- | src/input_common/drivers/sdl_driver.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp index 4ed10aba9..c17ea305e 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp | |||
| @@ -505,7 +505,7 @@ std::vector<Common::ParamPackage> SDLDriver::GetInputDevices() const { | |||
| 505 | Common::Input::VibrationError SDLDriver::SetRumble( | 505 | Common::Input::VibrationError SDLDriver::SetRumble( |
| 506 | const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) { | 506 | const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) { |
| 507 | const auto joystick = | 507 | const auto joystick = |
| 508 | GetSDLJoystickByGUID(identifier.guid.Format(), static_cast<int>(identifier.port)); | 508 | GetSDLJoystickByGUID(identifier.guid.RawString(), static_cast<int>(identifier.port)); |
| 509 | const auto process_amplitude_exp = [](f32 amplitude, f32 factor) { | 509 | const auto process_amplitude_exp = [](f32 amplitude, f32 factor) { |
| 510 | return (amplitude + std::pow(amplitude, factor)) * 0.5f * 0xFFFF; | 510 | return (amplitude + std::pow(amplitude, factor)) * 0.5f * 0xFFFF; |
| 511 | }; | 511 | }; |
| @@ -602,7 +602,7 @@ Common::ParamPackage SDLDriver::BuildParamPackageForAnalog(PadIdentifier identif | |||
| 602 | Common::ParamPackage params; | 602 | Common::ParamPackage params; |
| 603 | params.Set("engine", GetEngineName()); | 603 | params.Set("engine", GetEngineName()); |
| 604 | params.Set("port", static_cast<int>(identifier.port)); | 604 | params.Set("port", static_cast<int>(identifier.port)); |
| 605 | params.Set("guid", identifier.guid.Format()); | 605 | params.Set("guid", identifier.guid.RawString()); |
| 606 | params.Set("axis_x", axis_x); | 606 | params.Set("axis_x", axis_x); |
| 607 | params.Set("axis_y", axis_y); | 607 | params.Set("axis_y", axis_y); |
| 608 | params.Set("offset_x", offset_x); | 608 | params.Set("offset_x", offset_x); |
| @@ -814,7 +814,7 @@ AnalogMapping SDLDriver::GetAnalogMappingForDevice(const Common::ParamPackage& p | |||
| 814 | PreSetAxis(identifier, binding_left_x.value.axis); | 814 | PreSetAxis(identifier, binding_left_x.value.axis); |
| 815 | PreSetAxis(identifier, binding_left_y.value.axis); | 815 | PreSetAxis(identifier, binding_left_y.value.axis); |
| 816 | const auto left_offset_x = -GetAxis(identifier, binding_left_x.value.axis); | 816 | const auto left_offset_x = -GetAxis(identifier, binding_left_x.value.axis); |
| 817 | const auto left_offset_y = -GetAxis(identifier, binding_left_y.value.axis); | 817 | const auto left_offset_y = GetAxis(identifier, binding_left_y.value.axis); |
| 818 | mapping.insert_or_assign(Settings::NativeAnalog::LStick, | 818 | mapping.insert_or_assign(Settings::NativeAnalog::LStick, |
| 819 | BuildParamPackageForAnalog(identifier, binding_left_x.value.axis, | 819 | BuildParamPackageForAnalog(identifier, binding_left_x.value.axis, |
| 820 | binding_left_y.value.axis, | 820 | binding_left_y.value.axis, |
| @@ -825,7 +825,7 @@ AnalogMapping SDLDriver::GetAnalogMappingForDevice(const Common::ParamPackage& p | |||
| 825 | PreSetAxis(identifier, binding_left_x.value.axis); | 825 | PreSetAxis(identifier, binding_left_x.value.axis); |
| 826 | PreSetAxis(identifier, binding_left_y.value.axis); | 826 | PreSetAxis(identifier, binding_left_y.value.axis); |
| 827 | const auto left_offset_x = -GetAxis(identifier, binding_left_x.value.axis); | 827 | const auto left_offset_x = -GetAxis(identifier, binding_left_x.value.axis); |
| 828 | const auto left_offset_y = -GetAxis(identifier, binding_left_y.value.axis); | 828 | const auto left_offset_y = GetAxis(identifier, binding_left_y.value.axis); |
| 829 | mapping.insert_or_assign(Settings::NativeAnalog::LStick, | 829 | mapping.insert_or_assign(Settings::NativeAnalog::LStick, |
| 830 | BuildParamPackageForAnalog(identifier, binding_left_x.value.axis, | 830 | BuildParamPackageForAnalog(identifier, binding_left_x.value.axis, |
| 831 | binding_left_y.value.axis, | 831 | binding_left_y.value.axis, |
| @@ -840,7 +840,7 @@ AnalogMapping SDLDriver::GetAnalogMappingForDevice(const Common::ParamPackage& p | |||
| 840 | PreSetAxis(identifier, binding_right_x.value.axis); | 840 | PreSetAxis(identifier, binding_right_x.value.axis); |
| 841 | PreSetAxis(identifier, binding_right_y.value.axis); | 841 | PreSetAxis(identifier, binding_right_y.value.axis); |
| 842 | const auto right_offset_x = -GetAxis(identifier, binding_right_x.value.axis); | 842 | const auto right_offset_x = -GetAxis(identifier, binding_right_x.value.axis); |
| 843 | const auto right_offset_y = -GetAxis(identifier, binding_right_y.value.axis); | 843 | const auto right_offset_y = GetAxis(identifier, binding_right_y.value.axis); |
| 844 | mapping.insert_or_assign(Settings::NativeAnalog::RStick, | 844 | mapping.insert_or_assign(Settings::NativeAnalog::RStick, |
| 845 | BuildParamPackageForAnalog(identifier, binding_right_x.value.axis, | 845 | BuildParamPackageForAnalog(identifier, binding_right_x.value.axis, |
| 846 | binding_right_y.value.axis, right_offset_x, | 846 | binding_right_y.value.axis, right_offset_x, |