summaryrefslogtreecommitdiff
path: root/src/input_common
diff options
context:
space:
mode:
authorGravatar lat9nq2021-06-28 15:58:16 -0400
committerGravatar lat9nq2021-06-28 17:32:17 -0400
commitb91b76df4fe27d781bd95ddb89b78ff54df57029 (patch)
treeabd3de5c02b036ec936a70599e496ba1d45d7849 /src/input_common
parentconfiguration: Defer to common/settings for per-game settings defaults (diff)
downloadyuzu-b91b76df4fe27d781bd95ddb89b78ff54df57029.tar.gz
yuzu-b91b76df4fe27d781bd95ddb89b78ff54df57029.tar.xz
yuzu-b91b76df4fe27d781bd95ddb89b78ff54df57029.zip
general: Make most settings a BasicSetting
Creates a new BasicSettings class in common/settings, and forces setting a default and label for each setting that uses it in common/settings. Moves defaults and labels from both frontends into common settings. Creates a helper function in each frontend to facillitate reading the settings now with the new default and label properties. Settings::Setting is also now a subclass of Settings::BasicSetting. Also adds documentation for both Setting and BasicSetting.
Diffstat (limited to '')
-rw-r--r--src/input_common/mouse/mouse_poller.cpp3
-rw-r--r--src/input_common/touch_from_button.cpp3
-rw-r--r--src/input_common/udp/client.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/input_common/mouse/mouse_poller.cpp b/src/input_common/mouse/mouse_poller.cpp
index 758f7af1f..4861a131e 100644
--- a/src/input_common/mouse/mouse_poller.cpp
+++ b/src/input_common/mouse/mouse_poller.cpp
@@ -84,7 +84,8 @@ public:
84 std::lock_guard lock{mutex}; 84 std::lock_guard lock{mutex};
85 const auto axis_value = 85 const auto axis_value =
86 static_cast<float>(mouse_input->GetMouseState(button).axis.at(axis)); 86 static_cast<float>(mouse_input->GetMouseState(button).axis.at(axis));
87 return axis_value * Settings::values.mouse_panning_sensitivity / (100.0f * range); 87 return axis_value * Settings::values.mouse_panning_sensitivity.GetValue() /
88 (100.0f * range);
88 } 89 }
89 90
90 std::pair<float, float> GetAnalog(u32 analog_axis_x, u32 analog_axis_y) const { 91 std::pair<float, float> GetAnalog(u32 analog_axis_x, u32 analog_axis_y) const {
diff --git a/src/input_common/touch_from_button.cpp b/src/input_common/touch_from_button.cpp
index 5b24fd8bf..87207f48f 100644
--- a/src/input_common/touch_from_button.cpp
+++ b/src/input_common/touch_from_button.cpp
@@ -12,8 +12,7 @@ namespace InputCommon {
12class TouchFromButtonDevice final : public Input::TouchDevice { 12class TouchFromButtonDevice final : public Input::TouchDevice {
13public: 13public:
14 TouchFromButtonDevice() { 14 TouchFromButtonDevice() {
15 const auto button_index = 15 const auto button_index = Settings::values.touch_from_button_map_index.GetValue();
16 static_cast<std::size_t>(Settings::values.touch_from_button_map_index);
17 const auto& buttons = Settings::values.touch_from_button_maps[button_index].buttons; 16 const auto& buttons = Settings::values.touch_from_button_maps[button_index].buttons;
18 17
19 for (const auto& config_entry : buttons) { 18 for (const auto& config_entry : buttons) {
diff --git a/src/input_common/udp/client.cpp b/src/input_common/udp/client.cpp
index bc1dfab3d..9b0aec797 100644
--- a/src/input_common/udp/client.cpp
+++ b/src/input_common/udp/client.cpp
@@ -201,7 +201,7 @@ bool Client::DeviceConnected(std::size_t pad) const {
201void Client::ReloadSockets() { 201void Client::ReloadSockets() {
202 Reset(); 202 Reset();
203 203
204 std::stringstream servers_ss(Settings::values.udp_input_servers); 204 std::stringstream servers_ss(static_cast<std::string>(Settings::values.udp_input_servers));
205 std::string server_token; 205 std::string server_token;
206 std::size_t client = 0; 206 std::size_t client = 0;
207 while (std::getline(servers_ss, server_token, ',')) { 207 while (std::getline(servers_ss, server_token, ',')) {
@@ -370,7 +370,7 @@ std::optional<std::size_t> Client::GetUnusedFingerID() const {
370 370
371void Client::UpdateTouchInput(Response::TouchPad& touch_pad, std::size_t client, std::size_t id) { 371void Client::UpdateTouchInput(Response::TouchPad& touch_pad, std::size_t client, std::size_t id) {
372 // TODO: Use custom calibration per device 372 // TODO: Use custom calibration per device
373 const Common::ParamPackage touch_param(Settings::values.touch_device); 373 const Common::ParamPackage touch_param(Settings::values.touch_device.GetValue());
374 const u16 min_x = static_cast<u16>(touch_param.Get("min_x", 100)); 374 const u16 min_x = static_cast<u16>(touch_param.Get("min_x", 100));
375 const u16 min_y = static_cast<u16>(touch_param.Get("min_y", 50)); 375 const u16 min_y = static_cast<u16>(touch_param.Get("min_y", 50));
376 const u16 max_x = static_cast<u16>(touch_param.Get("max_x", 1800)); 376 const u16 max_x = static_cast<u16>(touch_param.Get("max_x", 1800));