diff options
| author | 2023-12-28 23:24:23 -0500 | |
|---|---|---|
| committer | 2023-12-30 15:11:36 -0500 | |
| commit | 051afd21e730005ea24ce3c8743962beb3085031 (patch) | |
| tree | 268c3ce0d0031e233555389c97a3eed530e9374b /src/yuzu_cmd | |
| parent | android: Migrate theme settings to ini (diff) | |
| download | yuzu-051afd21e730005ea24ce3c8743962beb3085031.tar.gz yuzu-051afd21e730005ea24ce3c8743962beb3085031.tar.xz yuzu-051afd21e730005ea24ce3c8743962beb3085031.zip | |
frontend_common: config: Refactor WriteSetting to stricter types
Previously this could cause problems if a version of the template generated for WriteSetting didn't use the type you needed (e.g. floating point values). Now these are all ready without having to be used within frontend_common first.
Diffstat (limited to 'src/yuzu_cmd')
| -rw-r--r-- | src/yuzu_cmd/sdl_config.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/yuzu_cmd/sdl_config.cpp b/src/yuzu_cmd/sdl_config.cpp index 39fd8050c..e81bf5d45 100644 --- a/src/yuzu_cmd/sdl_config.cpp +++ b/src/yuzu_cmd/sdl_config.cpp | |||
| @@ -213,43 +213,45 @@ void SdlConfig::SaveSdlPlayerValues(const std::size_t player_index) { | |||
| 213 | 213 | ||
| 214 | for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) { | 214 | for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) { |
| 215 | const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]); | 215 | const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]); |
| 216 | WriteSetting(std::string(player_prefix).append(Settings::NativeButton::mapping[i]), | 216 | WriteStringSetting(std::string(player_prefix).append(Settings::NativeButton::mapping[i]), |
| 217 | player.buttons[i], std::make_optional(default_param)); | 217 | player.buttons[i], std::make_optional(default_param)); |
| 218 | } | 218 | } |
| 219 | for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) { | 219 | for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) { |
| 220 | const std::string default_param = InputCommon::GenerateAnalogParamFromKeys( | 220 | const std::string default_param = InputCommon::GenerateAnalogParamFromKeys( |
| 221 | default_analogs[i][0], default_analogs[i][1], default_analogs[i][2], | 221 | default_analogs[i][0], default_analogs[i][1], default_analogs[i][2], |
| 222 | default_analogs[i][3], default_stick_mod[i], 0.5f); | 222 | default_analogs[i][3], default_stick_mod[i], 0.5f); |
| 223 | WriteSetting(std::string(player_prefix).append(Settings::NativeAnalog::mapping[i]), | 223 | WriteStringSetting(std::string(player_prefix).append(Settings::NativeAnalog::mapping[i]), |
| 224 | player.analogs[i], std::make_optional(default_param)); | 224 | player.analogs[i], std::make_optional(default_param)); |
| 225 | } | 225 | } |
| 226 | for (int i = 0; i < Settings::NativeMotion::NumMotions; ++i) { | 226 | for (int i = 0; i < Settings::NativeMotion::NumMotions; ++i) { |
| 227 | const std::string default_param = InputCommon::GenerateKeyboardParam(default_motions[i]); | 227 | const std::string default_param = InputCommon::GenerateKeyboardParam(default_motions[i]); |
| 228 | WriteSetting(std::string(player_prefix).append(Settings::NativeMotion::mapping[i]), | 228 | WriteStringSetting(std::string(player_prefix).append(Settings::NativeMotion::mapping[i]), |
| 229 | player.motions[i], std::make_optional(default_param)); | 229 | player.motions[i], std::make_optional(default_param)); |
| 230 | } | 230 | } |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | void SdlConfig::SaveDebugControlValues() { | 233 | void SdlConfig::SaveDebugControlValues() { |
| 234 | for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) { | 234 | for (int i = 0; i < Settings::NativeButton::NumButtons; ++i) { |
| 235 | const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]); | 235 | const std::string default_param = InputCommon::GenerateKeyboardParam(default_buttons[i]); |
| 236 | WriteSetting(std::string("debug_pad_").append(Settings::NativeButton::mapping[i]), | 236 | WriteStringSetting(std::string("debug_pad_").append(Settings::NativeButton::mapping[i]), |
| 237 | Settings::values.debug_pad_buttons[i], std::make_optional(default_param)); | 237 | Settings::values.debug_pad_buttons[i], |
| 238 | std::make_optional(default_param)); | ||
| 238 | } | 239 | } |
| 239 | for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) { | 240 | for (int i = 0; i < Settings::NativeAnalog::NumAnalogs; ++i) { |
| 240 | const std::string default_param = InputCommon::GenerateAnalogParamFromKeys( | 241 | const std::string default_param = InputCommon::GenerateAnalogParamFromKeys( |
| 241 | default_analogs[i][0], default_analogs[i][1], default_analogs[i][2], | 242 | default_analogs[i][0], default_analogs[i][1], default_analogs[i][2], |
| 242 | default_analogs[i][3], default_stick_mod[i], 0.5f); | 243 | default_analogs[i][3], default_stick_mod[i], 0.5f); |
| 243 | WriteSetting(std::string("debug_pad_").append(Settings::NativeAnalog::mapping[i]), | 244 | WriteStringSetting(std::string("debug_pad_").append(Settings::NativeAnalog::mapping[i]), |
| 244 | Settings::values.debug_pad_analogs[i], std::make_optional(default_param)); | 245 | Settings::values.debug_pad_analogs[i], |
| 246 | std::make_optional(default_param)); | ||
| 245 | } | 247 | } |
| 246 | } | 248 | } |
| 247 | 249 | ||
| 248 | void SdlConfig::SaveHidbusValues() { | 250 | void SdlConfig::SaveHidbusValues() { |
| 249 | const std::string default_param = InputCommon::GenerateAnalogParamFromKeys( | 251 | const std::string default_param = InputCommon::GenerateAnalogParamFromKeys( |
| 250 | 0, 0, default_ringcon_analogs[0], default_ringcon_analogs[1], 0, 0.05f); | 252 | 0, 0, default_ringcon_analogs[0], default_ringcon_analogs[1], 0, 0.05f); |
| 251 | WriteSetting(std::string("ring_controller"), Settings::values.ringcon_analogs, | 253 | WriteStringSetting(std::string("ring_controller"), Settings::values.ringcon_analogs, |
| 252 | std::make_optional(default_param)); | 254 | std::make_optional(default_param)); |
| 253 | } | 255 | } |
| 254 | 256 | ||
| 255 | std::vector<Settings::BasicSetting*>& SdlConfig::FindRelevantList(Settings::Category category) { | 257 | std::vector<Settings::BasicSetting*>& SdlConfig::FindRelevantList(Settings::Category category) { |