diff options
| author | 2020-07-22 10:39:53 -0400 | |
|---|---|---|
| committer | 2020-08-26 02:32:32 -0400 | |
| commit | f0fac0c7fb6f7dd9fe81747b3369767c8c9e7d01 (patch) | |
| tree | 4438688a9b9b4bc015985f2df1a731de57fe50db /src/input_common/sdl/sdl_impl.h | |
| parent | Merge pull request #4582 from lioncash/xbyak (diff) | |
| download | yuzu-f0fac0c7fb6f7dd9fe81747b3369767c8c9e7d01.tar.gz yuzu-f0fac0c7fb6f7dd9fe81747b3369767c8c9e7d01.tar.xz yuzu-f0fac0c7fb6f7dd9fe81747b3369767c8c9e7d01.zip | |
Project Mjölnir: Part 1
Co-authored-by: James Rowe <jroweboy@gmail.com>
Co-authored-by: Its-Rei <kupfel@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | src/input_common/sdl/sdl_impl.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/input_common/sdl/sdl_impl.h b/src/input_common/sdl/sdl_impl.h index 606a32c5b..bd19ba61d 100644 --- a/src/input_common/sdl/sdl_impl.h +++ b/src/input_common/sdl/sdl_impl.h | |||
| @@ -50,6 +50,11 @@ public: | |||
| 50 | std::atomic<bool> polling = false; | 50 | std::atomic<bool> polling = false; |
| 51 | Common::SPSCQueue<SDL_Event> event_queue; | 51 | Common::SPSCQueue<SDL_Event> event_queue; |
| 52 | 52 | ||
| 53 | std::vector<Common::ParamPackage> GetInputDevices() override; | ||
| 54 | |||
| 55 | ButtonMapping GetButtonMappingForDevice(const Common::ParamPackage& params) override; | ||
| 56 | AnalogMapping GetAnalogMappingForDevice(const Common::ParamPackage& params) override; | ||
| 57 | |||
| 53 | private: | 58 | private: |
| 54 | void InitJoystick(int joystick_index); | 59 | void InitJoystick(int joystick_index); |
| 55 | void CloseJoystick(SDL_Joystick* sdl_joystick); | 60 | void CloseJoystick(SDL_Joystick* sdl_joystick); |
| @@ -57,6 +62,9 @@ private: | |||
| 57 | /// Needs to be called before SDL_QuitSubSystem. | 62 | /// Needs to be called before SDL_QuitSubSystem. |
| 58 | void CloseJoysticks(); | 63 | void CloseJoysticks(); |
| 59 | 64 | ||
| 65 | // Set to true if SDL supports game controller subsystem | ||
| 66 | bool has_gamecontroller = false; | ||
| 67 | |||
| 60 | /// Map of GUID of a list of corresponding virtual Joysticks | 68 | /// Map of GUID of a list of corresponding virtual Joysticks |
| 61 | std::unordered_map<std::string, std::vector<std::shared_ptr<SDLJoystick>>> joystick_map; | 69 | std::unordered_map<std::string, std::vector<std::shared_ptr<SDLJoystick>>> joystick_map; |
| 62 | std::mutex joystick_map_mutex; | 70 | std::mutex joystick_map_mutex; |