diff options
author | bunnei <bunneidev@gmail.com> | 2020-09-01 13:56:37 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-01 13:56:37 -0400 |
commit | 3dcccabd1d1c046fa9d72f6031d3b83f36b87ece (patch) | |
tree | 38397c8aa36cd6848ee237258e85b43ff4ab494b /src/core/settings.h | |
parent | ad9ce67b5262e383050e5af629e2eda71391c2bd (diff) | |
parent | d1e1ea0fef0ddfe914f14a2d547b922b71081695 (diff) |
Merge pull request #4382 from FearlessTobi/port-udp-config
yuzu: Add motion and touch configuration from Citra
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: Type local{}; }; +struct TouchFromButtonMap { + std::string name; + std::vector<std::string> buttons; +}; + struct Values { // Audio std::string audio_device_id; @@ -145,15 +150,18 @@ struct Values { ButtonsRaw debug_pad_buttons; AnalogsRaw debug_pad_analogs; - std::string motion_device; - bool vibration_enabled; + std::string motion_device; + std::string touch_device; TouchscreenInput touchscreen; std::atomic_bool is_device_reload_pending{true}; + bool use_touch_from_button; + int touch_from_button_map_index; std::string udp_input_address; u16 udp_input_port; u8 udp_pad_index; + std::vector<TouchFromButtonMap> touch_from_button_maps; // Data Storage bool use_virtual_sd; |