summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/common/input.h6
-rw-r--r--src/input_common/drivers/gc_adapter.cpp4
-rw-r--r--src/input_common/drivers/gc_adapter.h2
-rw-r--r--src/input_common/drivers/sdl_driver.cpp6
-rw-r--r--src/input_common/drivers/sdl_driver.h2
-rw-r--r--src/input_common/input_engine.h2
-rw-r--r--src/input_common/input_poller.cpp2
7 files changed, 12 insertions, 12 deletions
diff --git a/src/common/input.h b/src/common/input.h
index eaee0bdea..12d5d976f 100644
--- a/src/common/input.h
+++ b/src/common/input.h
@@ -266,11 +266,9 @@ class OutputDevice {
266public: 266public:
267 virtual ~OutputDevice() = default; 267 virtual ~OutputDevice() = default;
268 268
269 virtual void SetLED([[maybe_unused]] LedStatus led_status) { 269 virtual void SetLED([[maybe_unused]] LedStatus led_status) {}
270 return;
271 }
272 270
273 virtual VibrationError SetVibration([[maybe_unused]] VibrationStatus vibration_status) { 271 virtual VibrationError SetVibration([[maybe_unused]] const VibrationStatus& vibration_status) {
274 return VibrationError::NotSupported; 272 return VibrationError::NotSupported;
275 } 273 }
276 274
diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp
index 451147755..7ab4540a8 100644
--- a/src/input_common/drivers/gc_adapter.cpp
+++ b/src/input_common/drivers/gc_adapter.cpp
@@ -325,8 +325,8 @@ bool GCAdapter::GetGCEndpoint(libusb_device* device) {
325 return true; 325 return true;
326} 326}
327 327
328Common::Input::VibrationError GCAdapter::SetRumble(const PadIdentifier& identifier, 328Common::Input::VibrationError GCAdapter::SetRumble(
329 const Common::Input::VibrationStatus vibration) { 329 const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) {
330 const auto mean_amplitude = (vibration.low_amplitude + vibration.high_amplitude) * 0.5f; 330 const auto mean_amplitude = (vibration.low_amplitude + vibration.high_amplitude) * 0.5f;
331 const auto processed_amplitude = 331 const auto processed_amplitude =
332 static_cast<u8>((mean_amplitude + std::pow(mean_amplitude, 0.3f)) * 0.5f * 0x8); 332 static_cast<u8>((mean_amplitude + std::pow(mean_amplitude, 0.3f)) * 0.5f * 0x8);
diff --git a/src/input_common/drivers/gc_adapter.h b/src/input_common/drivers/gc_adapter.h
index 3c4f0396c..7ce1912a3 100644
--- a/src/input_common/drivers/gc_adapter.h
+++ b/src/input_common/drivers/gc_adapter.h
@@ -28,7 +28,7 @@ public:
28 ~GCAdapter() override; 28 ~GCAdapter() override;
29 29
30 Common::Input::VibrationError SetRumble( 30 Common::Input::VibrationError SetRumble(
31 const PadIdentifier& identifier, const Common::Input::VibrationStatus vibration) override; 31 const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
32 32
33 /// Used for automapping features 33 /// Used for automapping features
34 std::vector<Common::ParamPackage> GetInputDevices() const override; 34 std::vector<Common::ParamPackage> GetInputDevices() const override;
diff --git a/src/input_common/drivers/sdl_driver.cpp b/src/input_common/drivers/sdl_driver.cpp
index 1bae6cdc8..a9219dbf2 100644
--- a/src/input_common/drivers/sdl_driver.cpp
+++ b/src/input_common/drivers/sdl_driver.cpp
@@ -491,8 +491,9 @@ std::vector<Common::ParamPackage> SDLDriver::GetInputDevices() const {
491 } 491 }
492 return devices; 492 return devices;
493} 493}
494Common::Input::VibrationError SDLDriver::SetRumble(const PadIdentifier& identifier, 494
495 const Common::Input::VibrationStatus vibration) { 495Common::Input::VibrationError SDLDriver::SetRumble(
496 const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) {
496 const auto joystick = 497 const auto joystick =
497 GetSDLJoystickByGUID(identifier.guid.Format(), static_cast<int>(identifier.port)); 498 GetSDLJoystickByGUID(identifier.guid.Format(), static_cast<int>(identifier.port));
498 const auto process_amplitude_exp = [](f32 amplitude, f32 factor) { 499 const auto process_amplitude_exp = [](f32 amplitude, f32 factor) {
@@ -526,6 +527,7 @@ Common::Input::VibrationError SDLDriver::SetRumble(const PadIdentifier& identifi
526 527
527 return Common::Input::VibrationError::None; 528 return Common::Input::VibrationError::None;
528} 529}
530
529Common::ParamPackage SDLDriver::BuildAnalogParamPackageForButton(int port, std::string guid, 531Common::ParamPackage SDLDriver::BuildAnalogParamPackageForButton(int port, std::string guid,
530 s32 axis, float value) const { 532 s32 axis, float value) const {
531 Common::ParamPackage params{}; 533 Common::ParamPackage params{};
diff --git a/src/input_common/drivers/sdl_driver.h b/src/input_common/drivers/sdl_driver.h
index c6fffe374..e9a5d2e26 100644
--- a/src/input_common/drivers/sdl_driver.h
+++ b/src/input_common/drivers/sdl_driver.h
@@ -59,7 +59,7 @@ public:
59 u8 GetHatButtonId(const std::string& direction_name) const override; 59 u8 GetHatButtonId(const std::string& direction_name) const override;
60 60
61 Common::Input::VibrationError SetRumble( 61 Common::Input::VibrationError SetRumble(
62 const PadIdentifier& identifier, const Common::Input::VibrationStatus vibration) override; 62 const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override;
63 63
64private: 64private:
65 void InitJoystick(int joystick_index); 65 void InitJoystick(int joystick_index);
diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h
index b21adfabf..15cd5fa2e 100644
--- a/src/input_common/input_engine.h
+++ b/src/input_common/input_engine.h
@@ -119,7 +119,7 @@ public:
119 // Sets rumble to a controller 119 // Sets rumble to a controller
120 virtual Common::Input::VibrationError SetRumble( 120 virtual Common::Input::VibrationError SetRumble(
121 [[maybe_unused]] const PadIdentifier& identifier, 121 [[maybe_unused]] const PadIdentifier& identifier,
122 [[maybe_unused]] const Common::Input::VibrationStatus vibration) { 122 [[maybe_unused]] const Common::Input::VibrationStatus& vibration) {
123 return Common::Input::VibrationError::NotSupported; 123 return Common::Input::VibrationError::NotSupported;
124 } 124 }
125 125
diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp
index 7e4eafded..de63f36b3 100644
--- a/src/input_common/input_poller.cpp
+++ b/src/input_common/input_poller.cpp
@@ -673,7 +673,7 @@ public:
673 } 673 }
674 674
675 virtual Common::Input::VibrationError SetVibration( 675 virtual Common::Input::VibrationError SetVibration(
676 Common::Input::VibrationStatus vibration_status) { 676 const Common::Input::VibrationStatus& vibration_status) {
677 return input_engine->SetRumble(identifier, vibration_status); 677 return input_engine->SetRumble(identifier, vibration_status);
678 } 678 }
679 679