summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlat9nq <lat9nq@virginia.edu>2020-07-18 19:25:07 +0200
committerlat9nq <lat9nq@virginia.edu>2020-07-19 19:26:55 +0200
commit55ac28769aec7df378e8afe97b015bb2a56a7fd5 (patch)
tree885c13886b4f5c60306e6e48a399c6e70cd5cada /src
parentconfiguration_shared: Break up tracker structs to respective classes (diff)
downloadyuzu-55ac28769aec7df378e8afe97b015bb2a56a7fd5.tar
yuzu-55ac28769aec7df378e8afe97b015bb2a56a7fd5.tar.gz
yuzu-55ac28769aec7df378e8afe97b015bb2a56a7fd5.tar.bz2
yuzu-55ac28769aec7df378e8afe97b015bb2a56a7fd5.tar.lz
yuzu-55ac28769aec7df378e8afe97b015bb2a56a7fd5.tar.xz
yuzu-55ac28769aec7df378e8afe97b015bb2a56a7fd5.tar.zst
yuzu-55ac28769aec7df378e8afe97b015bb2a56a7fd5.zip
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/configure_audio.cpp6
-rw-r--r--src/yuzu/configuration/configure_general.cpp13
-rw-r--r--src/yuzu/configuration/configure_graphics.cpp15
-rw-r--r--src/yuzu/configuration/configure_graphics_advanced.cpp18
-rw-r--r--src/yuzu/configuration/configure_system.cpp18
5 files changed, 32 insertions, 38 deletions
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index 1374e4742..392f35085 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -118,9 +118,9 @@ void ConfigureAudio::ApplyConfiguration() {
ui->volume_slider->maximum());
}
} else {
- ConfigurationShared::ApplyPerGameSetting(
- &Settings::values.enable_audio_stretching, ui->toggle_audio_stretching,
- trackers.enable_audio_stretching);
+ ConfigurationShared::ApplyPerGameSetting(&Settings::values.enable_audio_stretching,
+ ui->toggle_audio_stretching,
+ trackers.enable_audio_stretching);
if (ui->volume_combo_box->currentIndex() == 0) {
Settings::values.volume.SetGlobal(true);
} else {
diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp
index 672f9df87..3f7e1183a 100644
--- a/src/yuzu/configuration/configure_general.cpp
+++ b/src/yuzu/configuration/configure_general.cpp
@@ -68,11 +68,10 @@ void ConfigureGeneral::ApplyConfiguration() {
}
} else {
ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_multi_core,
- ui->use_multi_core,
- trackers.use_multi_core);
+ ui->use_multi_core, trackers.use_multi_core);
- bool global_frame_limit = trackers.use_frame_limit ==
- ConfigurationShared::CheckState::Global;
+ bool global_frame_limit =
+ trackers.use_frame_limit == ConfigurationShared::CheckState::Global;
Settings::values.use_frame_limit.SetGlobal(global_frame_limit);
Settings::values.frame_limit.SetGlobal(global_frame_limit);
if (!global_frame_limit) {
@@ -116,8 +115,8 @@ void ConfigureGeneral::SetupPerGameUI() {
trackers.use_multi_core);
connect(ui->toggle_frame_limit, &QCheckBox::clicked, ui->frame_limit, [this]() {
- ui->frame_limit->setEnabled(ui->toggle_frame_limit->isChecked() &&
- (trackers.use_frame_limit !=
- ConfigurationShared::CheckState::Global));
+ ui->frame_limit->setEnabled(
+ ui->toggle_frame_limit->isChecked() &&
+ (trackers.use_frame_limit != ConfigurationShared::CheckState::Global));
});
}
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index d419129ad..598701bf0 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -141,12 +141,12 @@ void ConfigureGraphics::ApplyConfiguration() {
ConfigurationShared::ApplyPerGameSetting(&Settings::values.aspect_ratio,
ui->aspect_ratio_combobox);
- ConfigurationShared::ApplyPerGameSetting(
- &Settings::values.use_disk_shader_cache, ui->use_disk_shader_cache,
- trackers.use_disk_shader_cache);
- ConfigurationShared::ApplyPerGameSetting(
- &Settings::values.use_asynchronous_gpu_emulation, ui->use_asynchronous_gpu_emulation,
- trackers.use_asynchronous_gpu_emulation);
+ ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_disk_shader_cache,
+ ui->use_disk_shader_cache,
+ trackers.use_disk_shader_cache);
+ ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_gpu_emulation,
+ ui->use_asynchronous_gpu_emulation,
+ trackers.use_asynchronous_gpu_emulation);
if (ui->bg_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
Settings::values.bg_red.SetGlobal(true);
@@ -260,8 +260,7 @@ void ConfigureGraphics::SetupPerGameUI() {
trackers.use_disk_shader_cache);
ConfigurationShared::SetColoredTristate(
ui->use_asynchronous_gpu_emulation, "use_asynchronous_gpu_emulation",
- Settings::values.use_asynchronous_gpu_emulation,
- trackers.use_asynchronous_gpu_emulation);
+ Settings::values.use_asynchronous_gpu_emulation, trackers.use_asynchronous_gpu_emulation);
ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label, "ar_label",
Settings::values.aspect_ratio.GetValue(true));
diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp
index 8bebc3080..5862ad7d1 100644
--- a/src/yuzu/configuration/configure_graphics_advanced.cpp
+++ b/src/yuzu/configuration/configure_graphics_advanced.cpp
@@ -90,18 +90,16 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() {
ui->anisotropic_filtering_combobox);
ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vsync, ui->use_vsync,
trackers.use_vsync);
- ConfigurationShared::ApplyPerGameSetting(
- &Settings::values.use_assembly_shaders, ui->use_assembly_shaders,
- trackers.use_assembly_shaders);
- ConfigurationShared::ApplyPerGameSetting(
- &Settings::values.use_asynchronous_shaders, ui->use_asynchronous_shaders,
- trackers.use_asynchronous_shaders);
+ ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_assembly_shaders,
+ ui->use_assembly_shaders,
+ trackers.use_assembly_shaders);
+ ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_shaders,
+ ui->use_asynchronous_shaders,
+ trackers.use_asynchronous_shaders);
ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time,
- ui->use_fast_gpu_time,
- trackers.use_fast_gpu_time);
+ ui->use_fast_gpu_time, trackers.use_fast_gpu_time);
ConfigurationShared::ApplyPerGameSetting(&Settings::values.force_30fps_mode,
- ui->force_30fps_mode,
- trackers.force_30fps_mode);
+ ui->force_30fps_mode, trackers.force_30fps_mode);
ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy,
ui->anisotropic_filtering_combobox);
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index e1d8ccf97..f47e7ebab 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -234,14 +234,12 @@ void ConfigureSystem::SetupPerGameUI() {
ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->label_sound, "label_sound",
Settings::values.sound_index.GetValue(true));
- ConfigurationShared::SetColoredTristate(ui->rng_seed_checkbox, "rng_seed_checkbox",
- Settings::values.rng_seed.UsingGlobal(),
- Settings::values.rng_seed.GetValue().has_value(),
- Settings::values.rng_seed.GetValue(true).has_value(),
- trackers.use_rng_seed);
- ConfigurationShared::SetColoredTristate(ui->custom_rtc_checkbox, "custom_rtc_checkbox",
- Settings::values.custom_rtc.UsingGlobal(),
- Settings::values.custom_rtc.GetValue().has_value(),
- Settings::values.custom_rtc.GetValue(true).has_value(),
- trackers.use_custom_rtc);
+ ConfigurationShared::SetColoredTristate(
+ ui->rng_seed_checkbox, "rng_seed_checkbox", Settings::values.rng_seed.UsingGlobal(),
+ Settings::values.rng_seed.GetValue().has_value(),
+ Settings::values.rng_seed.GetValue(true).has_value(), trackers.use_rng_seed);
+ ConfigurationShared::SetColoredTristate(
+ ui->custom_rtc_checkbox, "custom_rtc_checkbox", Settings::values.custom_rtc.UsingGlobal(),
+ Settings::values.custom_rtc.GetValue().has_value(),
+ Settings::values.custom_rtc.GetValue(true).has_value(), trackers.use_custom_rtc);
}