diff options
| author | 2020-07-14 19:01:36 +0200 | |
|---|---|---|
| committer | 2020-08-29 18:56:34 +0200 | |
| commit | e6bd1fd1b8487e421f71d43b6073ee56de1a043d (patch) | |
| tree | 53b383906fae814a67ae270b9b510a60f1b5df9d /src/core/settings.h | |
| parent | Merge pull request #4604 from lioncash/lifetime (diff) | |
| download | yuzu-e6bd1fd1b8487e421f71d43b6073ee56de1a043d.tar.gz yuzu-e6bd1fd1b8487e421f71d43b6073ee56de1a043d.tar.xz yuzu-e6bd1fd1b8487e421f71d43b6073ee56de1a043d.zip | |
yuzu: Add motion and touch configuration
Diffstat (limited to 'src/core/settings.h')
| -rw-r--r-- | src/core/settings.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/core/settings.h b/src/core/settings.h index 732c6a894..80f0d95a7 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -67,6 +67,11 @@ private: | |||
| 67 | Type local{}; | 67 | Type local{}; |
| 68 | }; | 68 | }; |
| 69 | 69 | ||
| 70 | struct TouchFromButtonMap { | ||
| 71 | std::string name; | ||
| 72 | std::vector<std::string> buttons; | ||
| 73 | }; | ||
| 74 | |||
| 70 | struct Values { | 75 | struct Values { |
| 71 | // Audio | 76 | // Audio |
| 72 | std::string audio_device_id; | 77 | std::string audio_device_id; |
| @@ -145,15 +150,18 @@ struct Values { | |||
| 145 | ButtonsRaw debug_pad_buttons; | 150 | ButtonsRaw debug_pad_buttons; |
| 146 | AnalogsRaw debug_pad_analogs; | 151 | AnalogsRaw debug_pad_analogs; |
| 147 | 152 | ||
| 148 | std::string motion_device; | ||
| 149 | |||
| 150 | bool vibration_enabled; | 153 | bool vibration_enabled; |
| 151 | 154 | ||
| 155 | std::string motion_device; | ||
| 156 | std::string touch_device; | ||
| 152 | TouchscreenInput touchscreen; | 157 | TouchscreenInput touchscreen; |
| 153 | std::atomic_bool is_device_reload_pending{true}; | 158 | std::atomic_bool is_device_reload_pending{true}; |
| 159 | bool use_touch_from_button; | ||
| 160 | int touch_from_button_map_index; | ||
| 154 | std::string udp_input_address; | 161 | std::string udp_input_address; |
| 155 | u16 udp_input_port; | 162 | u16 udp_input_port; |
| 156 | u8 udp_pad_index; | 163 | u8 udp_pad_index; |
| 164 | std::vector<TouchFromButtonMap> touch_from_button_maps; | ||
| 157 | 165 | ||
| 158 | // Data Storage | 166 | // Data Storage |
| 159 | bool use_virtual_sd; | 167 | bool use_virtual_sd; |