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 b031a8523..5cf1987ad 100644 --- a/src/input_common/drivers/sdl_driver.cpp +++ b/src/input_common/drivers/sdl_driver.cpp | |||
| @@ -502,7 +502,7 @@ std::vector<Common::ParamPackage> SDLDriver::GetInputDevices() const { | |||
| 502 | Common::Input::VibrationError SDLDriver::SetRumble( | 502 | Common::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); |
| @@ -811,7 +811,7 @@ AnalogMapping SDLDriver::GetAnalogMappingForDevice(const Common::ParamPackage& p | |||
| 811 | PreSetAxis(identifier, binding_left_x.value.axis); | 811 | PreSetAxis(identifier, binding_left_x.value.axis); |
| 812 | PreSetAxis(identifier, binding_left_y.value.axis); | 812 | PreSetAxis(identifier, binding_left_y.value.axis); |
| 813 | const auto left_offset_x = -GetAxis(identifier, binding_left_x.value.axis); | 813 | const auto left_offset_x = -GetAxis(identifier, binding_left_x.value.axis); |
| 814 | const auto left_offset_y = -GetAxis(identifier, binding_left_y.value.axis); | 814 | const auto left_offset_y = GetAxis(identifier, binding_left_y.value.axis); |
| 815 | mapping.insert_or_assign(Settings::NativeAnalog::LStick, | 815 | mapping.insert_or_assign(Settings::NativeAnalog::LStick, |
| 816 | BuildParamPackageForAnalog(identifier, binding_left_x.value.axis, | 816 | BuildParamPackageForAnalog(identifier, binding_left_x.value.axis, |
| 817 | binding_left_y.value.axis, | 817 | binding_left_y.value.axis, |
| @@ -822,7 +822,7 @@ AnalogMapping SDLDriver::GetAnalogMappingForDevice(const Common::ParamPackage& p | |||
| 822 | PreSetAxis(identifier, binding_left_x.value.axis); | 822 | PreSetAxis(identifier, binding_left_x.value.axis); |
| 823 | PreSetAxis(identifier, binding_left_y.value.axis); | 823 | PreSetAxis(identifier, binding_left_y.value.axis); |
| 824 | const auto left_offset_x = -GetAxis(identifier, binding_left_x.value.axis); | 824 | const auto left_offset_x = -GetAxis(identifier, binding_left_x.value.axis); |
| 825 | const auto left_offset_y = -GetAxis(identifier, binding_left_y.value.axis); | 825 | const auto left_offset_y = GetAxis(identifier, binding_left_y.value.axis); |
| 826 | mapping.insert_or_assign(Settings::NativeAnalog::LStick, | 826 | mapping.insert_or_assign(Settings::NativeAnalog::LStick, |
| 827 | BuildParamPackageForAnalog(identifier, binding_left_x.value.axis, | 827 | BuildParamPackageForAnalog(identifier, binding_left_x.value.axis, |
| 828 | binding_left_y.value.axis, | 828 | binding_left_y.value.axis, |
| @@ -837,7 +837,7 @@ AnalogMapping SDLDriver::GetAnalogMappingForDevice(const Common::ParamPackage& p | |||
| 837 | PreSetAxis(identifier, binding_right_x.value.axis); | 837 | PreSetAxis(identifier, binding_right_x.value.axis); |
| 838 | PreSetAxis(identifier, binding_right_y.value.axis); | 838 | PreSetAxis(identifier, binding_right_y.value.axis); |
| 839 | const auto right_offset_x = -GetAxis(identifier, binding_right_x.value.axis); | 839 | const auto right_offset_x = -GetAxis(identifier, binding_right_x.value.axis); |
| 840 | const auto right_offset_y = -GetAxis(identifier, binding_right_y.value.axis); | 840 | const auto right_offset_y = GetAxis(identifier, binding_right_y.value.axis); |
| 841 | mapping.insert_or_assign(Settings::NativeAnalog::RStick, | 841 | mapping.insert_or_assign(Settings::NativeAnalog::RStick, |
| 842 | BuildParamPackageForAnalog(identifier, binding_right_x.value.axis, | 842 | BuildParamPackageForAnalog(identifier, binding_right_x.value.axis, |
| 843 | binding_right_y.value.axis, right_offset_x, | 843 | binding_right_y.value.axis, right_offset_x, |