diff options
author | bunnei <bunneidev@gmail.com> | 2021-12-14 01:50:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-14 01:50:54 +0100 |
commit | ad45963b459d07d04e78f86d3316d7494730e9f9 (patch) | |
tree | a2e70a6ffad04ec840e4ff3cd581d7a4ec5853fa /src/input_common/drivers/sdl_driver.h | |
parent | Merge pull request #7576 from lioncash/tasenum (diff) | |
parent | input_engine: Fix typo in TriggerOnAxisChange() parameter name (diff) | |
download | yuzu-ad45963b459d07d04e78f86d3316d7494730e9f9.tar yuzu-ad45963b459d07d04e78f86d3316d7494730e9f9.tar.gz yuzu-ad45963b459d07d04e78f86d3316d7494730e9f9.tar.bz2 yuzu-ad45963b459d07d04e78f86d3316d7494730e9f9.tar.lz yuzu-ad45963b459d07d04e78f86d3316d7494730e9f9.tar.xz yuzu-ad45963b459d07d04e78f86d3316d7494730e9f9.tar.zst yuzu-ad45963b459d07d04e78f86d3316d7494730e9f9.zip |
Diffstat (limited to '')
-rw-r--r-- | src/input_common/drivers/sdl_driver.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/input_common/drivers/sdl_driver.h b/src/input_common/drivers/sdl_driver.h index d03ff4b84..e9a5d2e26 100644 --- a/src/input_common/drivers/sdl_driver.h +++ b/src/input_common/drivers/sdl_driver.h @@ -19,19 +19,19 @@ using SDL_GameController = struct _SDL_GameController; using SDL_Joystick = struct _SDL_Joystick; using SDL_JoystickID = s32; +namespace InputCommon { + +class SDLJoystick; + using ButtonBindings = std::array<std::pair<Settings::NativeButton::Values, SDL_GameControllerButton>, 17>; using ZButtonBindings = std::array<std::pair<Settings::NativeButton::Values, SDL_GameControllerAxis>, 2>; -namespace InputCommon { - -class SDLJoystick; - -class SDLDriver : public InputCommon::InputEngine { +class SDLDriver : public InputEngine { public: /// Initializes and registers SDL device factories - SDLDriver(const std::string& input_engine_); + explicit SDLDriver(std::string input_engine_); /// Unregisters SDL device factories and shut them down. ~SDLDriver() override; @@ -59,7 +59,7 @@ public: u8 GetHatButtonId(const std::string& direction_name) const override; Common::Input::VibrationError SetRumble( - const PadIdentifier& identifier, const Common::Input::VibrationStatus vibration) override; + const PadIdentifier& identifier, const Common::Input::VibrationStatus& vibration) override; private: void InitJoystick(int joystick_index); |