diff options
Diffstat (limited to 'src/yuzu_cmd')
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 8 | ||||
| -rw-r--r-- | src/yuzu_cmd/config.h | 4 | ||||
| -rw-r--r-- | src/yuzu_cmd/default_ini.h | 7 |
3 files changed, 5 insertions, 14 deletions
diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index 903e02297..ad7f9d239 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp | |||
| @@ -99,8 +99,8 @@ void Config::ReadSetting(const std::string& group, Settings::Setting<bool>& sett | |||
| 99 | setting = sdl2_config->GetBoolean(group, setting.GetLabel(), setting.GetDefault()); | 99 | setting = sdl2_config->GetBoolean(group, setting.GetLabel(), setting.GetDefault()); |
| 100 | } | 100 | } |
| 101 | 101 | ||
| 102 | template <typename Type> | 102 | template <typename Type, bool ranged> |
| 103 | void Config::ReadSetting(const std::string& group, Settings::Setting<Type>& setting) { | 103 | void Config::ReadSetting(const std::string& group, Settings::Setting<Type, ranged>& setting) { |
| 104 | setting = static_cast<Type>(sdl2_config->GetInteger(group, setting.GetLabel(), | 104 | setting = static_cast<Type>(sdl2_config->GetInteger(group, setting.GetLabel(), |
| 105 | static_cast<long>(setting.GetDefault()))); | 105 | static_cast<long>(setting.GetDefault()))); |
| 106 | } | 106 | } |
| @@ -310,8 +310,6 @@ void Config::ReadValues() { | |||
| 310 | ReadSetting("Renderer", Settings::values.gpu_accuracy); | 310 | ReadSetting("Renderer", Settings::values.gpu_accuracy); |
| 311 | ReadSetting("Renderer", Settings::values.use_asynchronous_gpu_emulation); | 311 | ReadSetting("Renderer", Settings::values.use_asynchronous_gpu_emulation); |
| 312 | ReadSetting("Renderer", Settings::values.use_vsync); | 312 | ReadSetting("Renderer", Settings::values.use_vsync); |
| 313 | ReadSetting("Renderer", Settings::values.fps_cap); | ||
| 314 | ReadSetting("Renderer", Settings::values.disable_fps_limit); | ||
| 315 | ReadSetting("Renderer", Settings::values.shader_backend); | 313 | ReadSetting("Renderer", Settings::values.shader_backend); |
| 316 | ReadSetting("Renderer", Settings::values.use_asynchronous_shaders); | 314 | ReadSetting("Renderer", Settings::values.use_asynchronous_shaders); |
| 317 | ReadSetting("Renderer", Settings::values.nvdec_emulation); | 315 | ReadSetting("Renderer", Settings::values.nvdec_emulation); |
| @@ -324,7 +322,7 @@ void Config::ReadValues() { | |||
| 324 | 322 | ||
| 325 | // Audio | 323 | // Audio |
| 326 | ReadSetting("Audio", Settings::values.sink_id); | 324 | ReadSetting("Audio", Settings::values.sink_id); |
| 327 | ReadSetting("Audio", Settings::values.audio_device_id); | 325 | ReadSetting("Audio", Settings::values.audio_output_device_id); |
| 328 | ReadSetting("Audio", Settings::values.volume); | 326 | ReadSetting("Audio", Settings::values.volume); |
| 329 | 327 | ||
| 330 | // Miscellaneous | 328 | // Miscellaneous |
diff --git a/src/yuzu_cmd/config.h b/src/yuzu_cmd/config.h index ccf77d668..32c03075f 100644 --- a/src/yuzu_cmd/config.h +++ b/src/yuzu_cmd/config.h | |||
| @@ -33,6 +33,6 @@ private: | |||
| 33 | * @param group The name of the INI group | 33 | * @param group The name of the INI group |
| 34 | * @param setting The yuzu setting to modify | 34 | * @param setting The yuzu setting to modify |
| 35 | */ | 35 | */ |
| 36 | template <typename Type> | 36 | template <typename Type, bool ranged> |
| 37 | void ReadSetting(const std::string& group, Settings::Setting<Type>& setting); | 37 | void ReadSetting(const std::string& group, Settings::Setting<Type, ranged>& setting); |
| 38 | }; | 38 | }; |
diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index a3b8432f5..d9a2a460c 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h | |||
| @@ -330,10 +330,6 @@ bg_red = | |||
| 330 | bg_blue = | 330 | bg_blue = |
| 331 | bg_green = | 331 | bg_green = |
| 332 | 332 | ||
| 333 | # Caps the unlocked framerate to a multiple of the title's target FPS. | ||
| 334 | # 1 - 1000: Target FPS multiple cap. 1000 (default) | ||
| 335 | fps_cap = | ||
| 336 | |||
| 337 | [Audio] | 333 | [Audio] |
| 338 | # Which audio output engine to use. | 334 | # Which audio output engine to use. |
| 339 | # auto (default): Auto-select | 335 | # auto (default): Auto-select |
| @@ -434,9 +430,6 @@ use_debug_asserts = | |||
| 434 | use_auto_stub = | 430 | use_auto_stub = |
| 435 | # Enables/Disables the macro JIT compiler | 431 | # Enables/Disables the macro JIT compiler |
| 436 | disable_macro_jit=false | 432 | disable_macro_jit=false |
| 437 | # Presents guest frames as they become available. Experimental. | ||
| 438 | # false: Disabled (default), true: Enabled | ||
| 439 | disable_fps_limit=false | ||
| 440 | # Determines whether to enable the GDB stub and wait for the debugger to attach before running. | 433 | # Determines whether to enable the GDB stub and wait for the debugger to attach before running. |
| 441 | # false: Disabled (default), true: Enabled | 434 | # false: Disabled (default), true: Enabled |
| 442 | use_gdbstub=false | 435 | use_gdbstub=false |