diff options
| author | 2021-09-01 18:48:01 -0500 | |
|---|---|---|
| committer | 2021-09-10 00:58:12 -0500 | |
| commit | 5798537ce431481f44e3335a1a291b733bd719ad (patch) | |
| tree | 16aa3dcf2c0f76b74ac47b22feb7b23ac10b3280 /src/common | |
| parent | Merge pull request #6965 from bunnei/cpu_manager_jthread (diff) | |
| download | yuzu-5798537ce431481f44e3335a1a291b733bd719ad.tar.gz yuzu-5798537ce431481f44e3335a1a291b733bd719ad.tar.xz yuzu-5798537ce431481f44e3335a1a291b733bd719ad.zip | |
input_common: Enable steam controllers and 8 player support
Diffstat (limited to '')
| -rw-r--r-- | src/common/settings.cpp | 3 | ||||
| -rw-r--r-- | src/common/settings.h | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index fd3b639cd..aa4613d08 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -72,6 +72,9 @@ void LogSettings() { | |||
| 72 | log_setting("Debugging_ProgramArgs", values.program_args.GetValue()); | 72 | log_setting("Debugging_ProgramArgs", values.program_args.GetValue()); |
| 73 | log_setting("Services_BCATBackend", values.bcat_backend.GetValue()); | 73 | log_setting("Services_BCATBackend", values.bcat_backend.GetValue()); |
| 74 | log_setting("Services_BCATBoxcatLocal", values.bcat_boxcat_local.GetValue()); | 74 | log_setting("Services_BCATBoxcatLocal", values.bcat_boxcat_local.GetValue()); |
| 75 | log_setting("Input_EnableMotion", values.motion_enabled.GetValue()); | ||
| 76 | log_setting("Input_EnableVibration", values.vibration_enabled.GetValue()); | ||
| 77 | log_setting("Input_EnableRawInput", values.enable_raw_input.GetValue()); | ||
| 75 | } | 78 | } |
| 76 | 79 | ||
| 77 | bool IsConfiguringGlobal() { | 80 | bool IsConfiguringGlobal() { |
diff --git a/src/common/settings.h b/src/common/settings.h index ec4d381e8..34065e937 100644 --- a/src/common/settings.h +++ b/src/common/settings.h | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #include "common/common_types.h" | 17 | #include "common/common_types.h" |
| 18 | #include "common/settings_input.h" | 18 | #include "common/settings_input.h" |
| 19 | #include "input_common/udp/client.h" | ||
| 20 | 19 | ||
| 21 | namespace Settings { | 20 | namespace Settings { |
| 22 | 21 | ||
| @@ -498,14 +497,15 @@ struct Values { | |||
| 498 | 497 | ||
| 499 | Setting<bool> use_docked_mode{true, "use_docked_mode"}; | 498 | Setting<bool> use_docked_mode{true, "use_docked_mode"}; |
| 500 | 499 | ||
| 500 | BasicSetting<bool> enable_raw_input{false, "enable_raw_input"}; | ||
| 501 | |||
| 501 | Setting<bool> vibration_enabled{true, "vibration_enabled"}; | 502 | Setting<bool> vibration_enabled{true, "vibration_enabled"}; |
| 502 | Setting<bool> enable_accurate_vibrations{false, "enable_accurate_vibrations"}; | 503 | Setting<bool> enable_accurate_vibrations{false, "enable_accurate_vibrations"}; |
| 503 | 504 | ||
| 504 | Setting<bool> motion_enabled{true, "motion_enabled"}; | 505 | Setting<bool> motion_enabled{true, "motion_enabled"}; |
| 505 | BasicSetting<std::string> motion_device{"engine:motion_emu,update_period:100,sensitivity:0.01", | 506 | BasicSetting<std::string> motion_device{"engine:motion_emu,update_period:100,sensitivity:0.01", |
| 506 | "motion_device"}; | 507 | "motion_device"}; |
| 507 | BasicSetting<std::string> udp_input_servers{InputCommon::CemuhookUDP::DEFAULT_SRV, | 508 | BasicSetting<std::string> udp_input_servers{"127.0.0.1:26760", "udp_input_servers"}; |
| 508 | "udp_input_servers"}; | ||
| 509 | 509 | ||
| 510 | BasicSetting<bool> mouse_panning{false, "mouse_panning"}; | 510 | BasicSetting<bool> mouse_panning{false, "mouse_panning"}; |
| 511 | BasicRangedSetting<u8> mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"}; | 511 | BasicRangedSetting<u8> mouse_panning_sensitivity{10, 1, 100, "mouse_panning_sensitivity"}; |