summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar lat9nq2020-07-18 13:25:07 -0400
committerGravatar lat9nq2020-07-19 13:26:55 -0400
commit55ac28769aec7df378e8afe97b015bb2a56a7fd5 (patch)
tree885c13886b4f5c60306e6e48a399c6e70cd5cada
parentconfiguration_shared: Break up tracker structs to respective classes (diff)
downloadyuzu-55ac28769aec7df378e8afe97b015bb2a56a7fd5.tar.gz
yuzu-55ac28769aec7df378e8afe97b015bb2a56a7fd5.tar.xz
yuzu-55ac28769aec7df378e8afe97b015bb2a56a7fd5.zip
clang-format
-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() {
118 ui->volume_slider->maximum()); 118 ui->volume_slider->maximum());
119 } 119 }
120 } else { 120 } else {
121 ConfigurationShared::ApplyPerGameSetting( 121 ConfigurationShared::ApplyPerGameSetting(&Settings::values.enable_audio_stretching,
122 &Settings::values.enable_audio_stretching, ui->toggle_audio_stretching, 122 ui->toggle_audio_stretching,
123 trackers.enable_audio_stretching); 123 trackers.enable_audio_stretching);
124 if (ui->volume_combo_box->currentIndex() == 0) { 124 if (ui->volume_combo_box->currentIndex() == 0) {
125 Settings::values.volume.SetGlobal(true); 125 Settings::values.volume.SetGlobal(true);
126 } else { 126 } 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() {
68 } 68 }
69 } else { 69 } else {
70 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_multi_core, 70 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_multi_core,
71 ui->use_multi_core, 71 ui->use_multi_core, trackers.use_multi_core);
72 trackers.use_multi_core);
73 72
74 bool global_frame_limit = trackers.use_frame_limit == 73 bool global_frame_limit =
75 ConfigurationShared::CheckState::Global; 74 trackers.use_frame_limit == ConfigurationShared::CheckState::Global;
76 Settings::values.use_frame_limit.SetGlobal(global_frame_limit); 75 Settings::values.use_frame_limit.SetGlobal(global_frame_limit);
77 Settings::values.frame_limit.SetGlobal(global_frame_limit); 76 Settings::values.frame_limit.SetGlobal(global_frame_limit);
78 if (!global_frame_limit) { 77 if (!global_frame_limit) {
@@ -116,8 +115,8 @@ void ConfigureGeneral::SetupPerGameUI() {
116 trackers.use_multi_core); 115 trackers.use_multi_core);
117 116
118 connect(ui->toggle_frame_limit, &QCheckBox::clicked, ui->frame_limit, [this]() { 117 connect(ui->toggle_frame_limit, &QCheckBox::clicked, ui->frame_limit, [this]() {
119 ui->frame_limit->setEnabled(ui->toggle_frame_limit->isChecked() && 118 ui->frame_limit->setEnabled(
120 (trackers.use_frame_limit != 119 ui->toggle_frame_limit->isChecked() &&
121 ConfigurationShared::CheckState::Global)); 120 (trackers.use_frame_limit != ConfigurationShared::CheckState::Global));
122 }); 121 });
123} 122}
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() {
141 ConfigurationShared::ApplyPerGameSetting(&Settings::values.aspect_ratio, 141 ConfigurationShared::ApplyPerGameSetting(&Settings::values.aspect_ratio,
142 ui->aspect_ratio_combobox); 142 ui->aspect_ratio_combobox);
143 143
144 ConfigurationShared::ApplyPerGameSetting( 144 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_disk_shader_cache,
145 &Settings::values.use_disk_shader_cache, ui->use_disk_shader_cache, 145 ui->use_disk_shader_cache,
146 trackers.use_disk_shader_cache); 146 trackers.use_disk_shader_cache);
147 ConfigurationShared::ApplyPerGameSetting( 147 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_gpu_emulation,
148 &Settings::values.use_asynchronous_gpu_emulation, ui->use_asynchronous_gpu_emulation, 148 ui->use_asynchronous_gpu_emulation,
149 trackers.use_asynchronous_gpu_emulation); 149 trackers.use_asynchronous_gpu_emulation);
150 150
151 if (ui->bg_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) { 151 if (ui->bg_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
152 Settings::values.bg_red.SetGlobal(true); 152 Settings::values.bg_red.SetGlobal(true);
@@ -260,8 +260,7 @@ void ConfigureGraphics::SetupPerGameUI() {
260 trackers.use_disk_shader_cache); 260 trackers.use_disk_shader_cache);
261 ConfigurationShared::SetColoredTristate( 261 ConfigurationShared::SetColoredTristate(
262 ui->use_asynchronous_gpu_emulation, "use_asynchronous_gpu_emulation", 262 ui->use_asynchronous_gpu_emulation, "use_asynchronous_gpu_emulation",
263 Settings::values.use_asynchronous_gpu_emulation, 263 Settings::values.use_asynchronous_gpu_emulation, trackers.use_asynchronous_gpu_emulation);
264 trackers.use_asynchronous_gpu_emulation);
265 264
266 ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label, "ar_label", 265 ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label, "ar_label",
267 Settings::values.aspect_ratio.GetValue(true)); 266 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() {
90 ui->anisotropic_filtering_combobox); 90 ui->anisotropic_filtering_combobox);
91 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vsync, ui->use_vsync, 91 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vsync, ui->use_vsync,
92 trackers.use_vsync); 92 trackers.use_vsync);
93 ConfigurationShared::ApplyPerGameSetting( 93 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_assembly_shaders,
94 &Settings::values.use_assembly_shaders, ui->use_assembly_shaders, 94 ui->use_assembly_shaders,
95 trackers.use_assembly_shaders); 95 trackers.use_assembly_shaders);
96 ConfigurationShared::ApplyPerGameSetting( 96 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_shaders,
97 &Settings::values.use_asynchronous_shaders, ui->use_asynchronous_shaders, 97 ui->use_asynchronous_shaders,
98 trackers.use_asynchronous_shaders); 98 trackers.use_asynchronous_shaders);
99 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time, 99 ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time,
100 ui->use_fast_gpu_time, 100 ui->use_fast_gpu_time, trackers.use_fast_gpu_time);
101 trackers.use_fast_gpu_time);
102 ConfigurationShared::ApplyPerGameSetting(&Settings::values.force_30fps_mode, 101 ConfigurationShared::ApplyPerGameSetting(&Settings::values.force_30fps_mode,
103 ui->force_30fps_mode, 102 ui->force_30fps_mode, trackers.force_30fps_mode);
104 trackers.force_30fps_mode);
105 ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy, 103 ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy,
106 ui->anisotropic_filtering_combobox); 104 ui->anisotropic_filtering_combobox);
107 105
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() {
234 ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->label_sound, "label_sound", 234 ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->label_sound, "label_sound",
235 Settings::values.sound_index.GetValue(true)); 235 Settings::values.sound_index.GetValue(true));
236 236
237 ConfigurationShared::SetColoredTristate(ui->rng_seed_checkbox, "rng_seed_checkbox", 237 ConfigurationShared::SetColoredTristate(
238 Settings::values.rng_seed.UsingGlobal(), 238 ui->rng_seed_checkbox, "rng_seed_checkbox", Settings::values.rng_seed.UsingGlobal(),
239 Settings::values.rng_seed.GetValue().has_value(), 239 Settings::values.rng_seed.GetValue().has_value(),
240 Settings::values.rng_seed.GetValue(true).has_value(), 240 Settings::values.rng_seed.GetValue(true).has_value(), trackers.use_rng_seed);
241 trackers.use_rng_seed); 241 ConfigurationShared::SetColoredTristate(
242 ConfigurationShared::SetColoredTristate(ui->custom_rtc_checkbox, "custom_rtc_checkbox", 242 ui->custom_rtc_checkbox, "custom_rtc_checkbox", Settings::values.custom_rtc.UsingGlobal(),
243 Settings::values.custom_rtc.UsingGlobal(), 243 Settings::values.custom_rtc.GetValue().has_value(),
244 Settings::values.custom_rtc.GetValue().has_value(), 244 Settings::values.custom_rtc.GetValue(true).has_value(), trackers.use_custom_rtc);
245 Settings::values.custom_rtc.GetValue(true).has_value(),
246 trackers.use_custom_rtc);
247} 245}