prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rebased

Browse Source
This commit is contained in:
lat9nq
2020-06-28 14:26:03 -04:00
parent 56321a8cbb
commit dd28c11624
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/settings.h
View File

@@ -432,6 +432,7 @@ struct Values {
// Audio
std::string audio_device_id;
std::string sink_id;
bool audio_muted;
Setting<bool> enable_audio_stretching;
Setting<float> volume;

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

@@ -7,6 +7,7 @@
#include "core/core.h"
#include "core/settings.h"
#include "ui_configure_general.h"
#include "yuzu/configuration/configuration_shared.h"
#include "yuzu/configuration/configure_general.h"
#include "yuzu/uisettings.h"
@@ -40,6 +41,9 @@ void ConfigureGeneral::SetConfiguration() {
ui->frame_limit->setValue(Settings::values.frame_limit);
if (!Settings::configuring_global) {
if (Settings::values.use_multi_core.UsingGlobal()) {
ui->use_multi_core->setCheckState(Qt::PartiallyChecked);
}
if (Settings::values.use_frame_limit.UsingGlobal()) {
ui->toggle_frame_limit->setCheckState(Qt::PartiallyChecked);
}
@@ -55,20 +59,16 @@ void ConfigureGeneral::ApplyConfiguration() {
UISettings::values.select_user_on_boot = ui->toggle_user_on_boot->isChecked();
UISettings::values.pause_when_in_background = ui->toggle_background_pause->isChecked();
UISettings::values.hide_mouse = ui->toggle_hide_mouse->isChecked();
}
Settings::values.use_multi_core = ui->use_multi_core->isChecked();
if (ui->toggle_frame_limit->checkState() != Qt::PartiallyChecked) {
if (!Settings::configuring_global) {
Settings::values.use_frame_limit.SetGlobal(false);
Settings::values.frame_limit.SetGlobal(false);
}
// Guard if during game and set to game-specific value
if (Settings::values.use_frame_limit.UsingGlobal()) {
Settings::values.use_frame_limit = ui->toggle_frame_limit->checkState() == Qt::Checked;
Settings::values.frame_limit = ui->frame_limit->value();
Settings::values.use_multi_core = ui->use_multi_core->isChecked();
}
} else {
ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_multi_core, ui->use_multi_core);
bool global_frame_limit = ui->toggle_frame_limit->checkState() == Qt::PartiallyChecked;
Settings::values.use_frame_limit.SetGlobal(global_frame_limit);
Settings::values.frame_limit.SetGlobal(global_frame_limit);
@@ -105,4 +105,5 @@ void ConfigureGeneral::SetupPerGameUI() {
ui->toggle_hide_mouse->setVisible(false);
ui->toggle_frame_limit->setTristate(true);
ui->use_multi_core->setTristate(true);
}

6
src/yuzu/main.cpp
View File

@@ -2129,14 +2129,10 @@ void GMainWindow::UpdateStatusBar() {
}
void GMainWindow::UpdateStatusButtons() {
<<<<<<< HEAD
dock_status_button->setChecked(Settings::base_values.use_docked_mode);
dock_status_button->setChecked(Settings::values.use_docked_mode);
multicore_status_button->setChecked(Settings::values.use_multi_core);
Settings::values.use_asynchronous_gpu_emulation =
Settings::values.use_asynchronous_gpu_emulation || Settings::values.use_multi_core;
=======
dock_status_button->setChecked(Settings::values.use_docked_mode);
>>>>>>> 45c9ccc6a... settings: restore old values struct
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation);
#ifdef HAS_VULKAN
renderer_status_button->setChecked(Settings::values.renderer_backend ==