diff options
author | Lioncash <mathew1800@gmail.com> | 2019-06-03 22:42:17 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-06-03 22:56:47 +0200 |
commit | cfac942e633d20793c75389bad6f0180d85bc1e1 (patch) | |
tree | f3a8baf5a38ce9074e5d54240a24e70491d4c84b | |
parent | input_common/sdl/sdl_impl: Amend names for axes for SDLAnalogPoller (diff) | |
download | yuzu-cfac942e633d20793c75389bad6f0180d85bc1e1.tar yuzu-cfac942e633d20793c75389bad6f0180d85bc1e1.tar.gz yuzu-cfac942e633d20793c75389bad6f0180d85bc1e1.tar.bz2 yuzu-cfac942e633d20793c75389bad6f0180d85bc1e1.tar.lz yuzu-cfac942e633d20793c75389bad6f0180d85bc1e1.tar.xz yuzu-cfac942e633d20793c75389bad6f0180d85bc1e1.tar.zst yuzu-cfac942e633d20793c75389bad6f0180d85bc1e1.zip |
-rw-r--r-- | src/input_common/sdl/sdl_impl.cpp | 7 | ||||
-rw-r--r-- | src/input_common/sdl/sdl_impl.h | 6 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/input_common/sdl/sdl_impl.cpp b/src/input_common/sdl/sdl_impl.cpp index e03f9b712..90615dc58 100644 --- a/src/input_common/sdl/sdl_impl.cpp +++ b/src/input_common/sdl/sdl_impl.cpp @@ -131,9 +131,6 @@ private: mutable std::mutex mutex; }; -/** - * Get the nth joystick with the corresponding GUID - */ std::shared_ptr<SDLJoystick> SDLState::GetSDLJoystickByGUID(const std::string& guid, int port) { std::lock_guard lock{joystick_map_mutex}; const auto it = joystick_map.find(guid); @@ -149,10 +146,6 @@ std::shared_ptr<SDLJoystick> SDLState::GetSDLJoystickByGUID(const std::string& g return joystick_map[guid].emplace_back(std::move(joystick)); } -/** - * Check how many identical joysticks (by guid) were connected before the one with sdl_id and so tie - * it to a SDLJoystick with the same guid and that port - */ std::shared_ptr<SDLJoystick> SDLState::GetSDLJoystickBySDLID(SDL_JoystickID sdl_id) { auto sdl_joystick = SDL_JoystickFromInstanceID(sdl_id); const std::string guid = GetGUID(sdl_joystick); diff --git a/src/input_common/sdl/sdl_impl.h b/src/input_common/sdl/sdl_impl.h index fadcf3139..606a32c5b 100644 --- a/src/input_common/sdl/sdl_impl.h +++ b/src/input_common/sdl/sdl_impl.h @@ -34,7 +34,13 @@ public: /// Handle SDL_Events for joysticks from SDL_PollEvent void HandleGameControllerEvent(const SDL_Event& event); + /// Get the nth joystick with the corresponding GUID std::shared_ptr<SDLJoystick> GetSDLJoystickBySDLID(SDL_JoystickID sdl_id); + + /** + * Check how many identical joysticks (by guid) were connected before the one with sdl_id and so + * tie it to a SDLJoystick with the same guid and that port + */ std::shared_ptr<SDLJoystick> GetSDLJoystickByGUID(const std::string& guid, int port); /// Get all DevicePoller that use the SDL backend for a specific device type |