diff options
| author | 2021-10-31 10:41:44 -0500 | |
|---|---|---|
| committer | 2021-11-24 20:30:26 -0600 | |
| commit | 730f07830247cfcdc551c253d30c6717fc16316c (patch) | |
| tree | 9a0d7dbee51ad20e4a174c1be08816289a586d6a /src/input_common/input_engine.h | |
| parent | kraken: Address comments from review (diff) | |
| download | yuzu-730f07830247cfcdc551c253d30c6717fc16316c.tar.gz yuzu-730f07830247cfcdc551c253d30c6717fc16316c.tar.xz yuzu-730f07830247cfcdc551c253d30c6717fc16316c.zip | |
settings: Fix Debug controller type options
Diffstat (limited to 'src/input_common/input_engine.h')
| -rw-r--r-- | src/input_common/input_engine.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/input_common/input_engine.h b/src/input_common/input_engine.h index ed79d3d93..5430c0cf8 100644 --- a/src/input_common/input_engine.h +++ b/src/input_common/input_engine.h | |||
| @@ -96,7 +96,7 @@ struct MappingCallback { | |||
| 96 | struct InputIdentifier { | 96 | struct InputIdentifier { |
| 97 | PadIdentifier identifier; | 97 | PadIdentifier identifier; |
| 98 | EngineInputType type; | 98 | EngineInputType type; |
| 99 | std::size_t index; | 99 | int index; |
| 100 | UpdateCallback callback; | 100 | UpdateCallback callback; |
| 101 | }; | 101 | }; |
| 102 | 102 | ||
| @@ -216,12 +216,11 @@ private: | |||
| 216 | 216 | ||
| 217 | bool IsInputIdentifierEqual(const InputIdentifier& input_identifier, | 217 | bool IsInputIdentifierEqual(const InputIdentifier& input_identifier, |
| 218 | const PadIdentifier& identifier, EngineInputType type, | 218 | const PadIdentifier& identifier, EngineInputType type, |
| 219 | std::size_t index) const; | 219 | int index) const; |
| 220 | 220 | ||
| 221 | mutable std::mutex mutex; | 221 | mutable std::mutex mutex; |
| 222 | mutable std::mutex mutex_callback; | 222 | mutable std::mutex mutex_callback; |
| 223 | bool configuring{false}; | 223 | bool configuring{false}; |
| 224 | bool is_callback_enabled{true}; | ||
| 225 | const std::string input_engine; | 224 | const std::string input_engine; |
| 226 | int last_callback_key = 0; | 225 | int last_callback_key = 0; |
| 227 | std::unordered_map<PadIdentifier, ControllerData> controller_list; | 226 | std::unordered_map<PadIdentifier, ControllerData> controller_list; |