tstarr/yuzu
1
0
Fork 0
mirror of https://github.com/starr-dusT/yuzu-mainline synced 2024-03-05 21:12:25 -08:00
Code Issues Packages Projects Releases Wiki Activity

clang-format

Browse Source
This commit is contained in:
lat9nq 2020-07-18 13:25:07 -04:00
parent 0d462f5608
commit 55ac28769a
5 changed files with 32 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/yuzu/configuration/configure_audio.cpp
View File

@ -118,9 +118,9 @@ void ConfigureAudio::ApplyConfiguration() {
ui->volume_slider->maximum()); ui->volume_slider->maximum());
} }
} else { } else {
ConfigurationShared::ApplyPerGameSetting( ConfigurationShared::ApplyPerGameSetting(&Settings::values.enable_audio_stretching,
&Settings::values.enable_audio_stretching, ui->toggle_audio_stretching, ui->toggle_audio_stretching,
trackers.enable_audio_stretching); trackers.enable_audio_stretching);
if (ui->volume_combo_box->currentIndex() == 0) { if (ui->volume_combo_box->currentIndex() == 0) {
Settings::values.volume.SetGlobal(true); Settings::values.volume.SetGlobal(true);
} else { } else {

13
src/yuzu/configuration/configure_general.cpp
View File

@ -68,11 +68,10 @@ void ConfigureGeneral::ApplyConfiguration() {
} }
} else { } else {
ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_multi_core, ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_multi_core,
ui->use_multi_core, ui->use_multi_core, trackers.use_multi_core);
trackers.use_multi_core);
bool global_frame_limit = trackers.use_frame_limit == bool global_frame_limit =
ConfigurationShared::CheckState::Global; trackers.use_frame_limit == ConfigurationShared::CheckState::Global;
Settings::values.use_frame_limit.SetGlobal(global_frame_limit); Settings::values.use_frame_limit.SetGlobal(global_frame_limit);
Settings::values.frame_limit.SetGlobal(global_frame_limit); Settings::values.frame_limit.SetGlobal(global_frame_limit);
if (!global_frame_limit) { if (!global_frame_limit) {
@ -116,8 +115,8 @@ void ConfigureGeneral::SetupPerGameUI() {
trackers.use_multi_core); trackers.use_multi_core);
connect(ui->toggle_frame_limit, &QCheckBox::clicked, ui->frame_limit, [this]() { connect(ui->toggle_frame_limit, &QCheckBox::clicked, ui->frame_limit, [this]() {
ui->frame_limit->setEnabled(ui->toggle_frame_limit->isChecked() && ui->frame_limit->setEnabled(
(trackers.use_frame_limit != ui->toggle_frame_limit->isChecked() &&
ConfigurationShared::CheckState::Global)); (trackers.use_frame_limit != ConfigurationShared::CheckState::Global));
}); });
} }

15
src/yuzu/configuration/configure_graphics.cpp
View File

@ -141,12 +141,12 @@ void ConfigureGraphics::ApplyConfiguration() {
ConfigurationShared::ApplyPerGameSetting(&Settings::values.aspect_ratio, ConfigurationShared::ApplyPerGameSetting(&Settings::values.aspect_ratio,
ui->aspect_ratio_combobox); ui->aspect_ratio_combobox);
ConfigurationShared::ApplyPerGameSetting( ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_disk_shader_cache,
&Settings::values.use_disk_shader_cache, ui->use_disk_shader_cache, ui->use_disk_shader_cache,
trackers.use_disk_shader_cache); trackers.use_disk_shader_cache);
ConfigurationShared::ApplyPerGameSetting( ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_gpu_emulation,
&Settings::values.use_asynchronous_gpu_emulation, ui->use_asynchronous_gpu_emulation, ui->use_asynchronous_gpu_emulation,
trackers.use_asynchronous_gpu_emulation); trackers.use_asynchronous_gpu_emulation);
if (ui->bg_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) { if (ui->bg_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
Settings::values.bg_red.SetGlobal(true); Settings::values.bg_red.SetGlobal(true);
@ -260,8 +260,7 @@ void ConfigureGraphics::SetupPerGameUI() {
trackers.use_disk_shader_cache); trackers.use_disk_shader_cache);
ConfigurationShared::SetColoredTristate( ConfigurationShared::SetColoredTristate(
ui->use_asynchronous_gpu_emulation, "use_asynchronous_gpu_emulation", ui->use_asynchronous_gpu_emulation, "use_asynchronous_gpu_emulation",
Settings::values.use_asynchronous_gpu_emulation, Settings::values.use_asynchronous_gpu_emulation, trackers.use_asynchronous_gpu_emulation);
trackers.use_asynchronous_gpu_emulation);
ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label, "ar_label", ConfigurationShared::SetColoredComboBox(ui->aspect_ratio_combobox, ui->ar_label, "ar_label",
Settings::values.aspect_ratio.GetValue(true)); Settings::values.aspect_ratio.GetValue(true));

18
src/yuzu/configuration/configure_graphics_advanced.cpp
View File

@ -90,18 +90,16 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() {
ui->anisotropic_filtering_combobox); ui->anisotropic_filtering_combobox);
ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vsync, ui->use_vsync, ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vsync, ui->use_vsync,
trackers.use_vsync); trackers.use_vsync);
ConfigurationShared::ApplyPerGameSetting( ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_assembly_shaders,
&Settings::values.use_assembly_shaders, ui->use_assembly_shaders, ui->use_assembly_shaders,
trackers.use_assembly_shaders); trackers.use_assembly_shaders);
ConfigurationShared::ApplyPerGameSetting( ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_shaders,
&Settings::values.use_asynchronous_shaders, ui->use_asynchronous_shaders, ui->use_asynchronous_shaders,
trackers.use_asynchronous_shaders); trackers.use_asynchronous_shaders);
ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time, ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time,
ui->use_fast_gpu_time, ui->use_fast_gpu_time, trackers.use_fast_gpu_time);
trackers.use_fast_gpu_time);
ConfigurationShared::ApplyPerGameSetting(&Settings::values.force_30fps_mode, ConfigurationShared::ApplyPerGameSetting(&Settings::values.force_30fps_mode,
ui->force_30fps_mode, ui->force_30fps_mode, trackers.force_30fps_mode);
trackers.force_30fps_mode);
ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy, ConfigurationShared::ApplyPerGameSetting(&Settings::values.max_anisotropy,
ui->anisotropic_filtering_combobox); ui->anisotropic_filtering_combobox);

18
src/yuzu/configuration/configure_system.cpp
View File

@ -234,14 +234,12 @@ void ConfigureSystem::SetupPerGameUI() {
ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->label_sound, "label_sound", ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->label_sound, "label_sound",
Settings::values.sound_index.GetValue(true)); Settings::values.sound_index.GetValue(true));
ConfigurationShared::SetColoredTristate(ui->rng_seed_checkbox, "rng_seed_checkbox", ConfigurationShared::SetColoredTristate(
Settings::values.rng_seed.UsingGlobal(), ui->rng_seed_checkbox, "rng_seed_checkbox", Settings::values.rng_seed.UsingGlobal(),
Settings::values.rng_seed.GetValue().has_value(), Settings::values.rng_seed.GetValue().has_value(),
Settings::values.rng_seed.GetValue(true).has_value(), Settings::values.rng_seed.GetValue(true).has_value(), trackers.use_rng_seed);
trackers.use_rng_seed); ConfigurationShared::SetColoredTristate(
ConfigurationShared::SetColoredTristate(ui->custom_rtc_checkbox, "custom_rtc_checkbox", ui->custom_rtc_checkbox, "custom_rtc_checkbox", Settings::values.custom_rtc.UsingGlobal(),
Settings::values.custom_rtc.UsingGlobal(), Settings::values.custom_rtc.GetValue().has_value(),
Settings::values.custom_rtc.GetValue().has_value(), Settings::values.custom_rtc.GetValue(true).has_value(), trackers.use_custom_rtc);
Settings::values.custom_rtc.GetValue(true).has_value(),
trackers.use_custom_rtc);
} }