summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFearlessTobi <thm.frey@gmail.com>2020-03-17 19:03:00 +0100
committerFearlessTobi <thm.frey@gmail.com>2020-03-17 19:03:00 +0100
commitcdeadd448ba16cd48d54f1ec170e06f056ab9f6a (patch)
tree885754f39f938143e5c25e2da5788f2aaf28734c
parentMerge pull request #3498 from ReinUsesLisp/texel-fetch-glsl (diff)
downloadyuzu-cdeadd448ba16cd48d54f1ec170e06f056ab9f6a.tar
yuzu-cdeadd448ba16cd48d54f1ec170e06f056ab9f6a.tar.gz
yuzu-cdeadd448ba16cd48d54f1ec170e06f056ab9f6a.tar.bz2
yuzu-cdeadd448ba16cd48d54f1ec170e06f056ab9f6a.tar.lz
yuzu-cdeadd448ba16cd48d54f1ec170e06f056ab9f6a.tar.xz
yuzu-cdeadd448ba16cd48d54f1ec170e06f056ab9f6a.tar.zst
yuzu-cdeadd448ba16cd48d54f1ec170e06f056ab9f6a.zip
-rw-r--r--src/core/settings.h1
-rw-r--r--src/yuzu/configuration/config.cpp4
-rw-r--r--src/yuzu/configuration/configure_system.cpp2
3 files changed, 7 insertions, 0 deletions
diff --git a/src/core/settings.h b/src/core/settings.h
index cb5979e6f..12e2cc9e7 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -387,6 +387,7 @@ struct Values {
s32 current_user;
s32 language_index;
+ s32 sound_index;
// Controls
std::array<PlayerInput, 10> players;
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index c38860628..e26af33b3 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -698,6 +698,8 @@ void Config::ReadSystemValues() {
Settings::values.custom_rtc = std::nullopt;
}
+ Settings::values.sound_index = ReadSetting(QStringLiteral("sound_index"), 1).toInt();
+
qt_config->endGroup();
}
@@ -1125,6 +1127,8 @@ void Config::SaveSystemValues() {
Settings::values.custom_rtc.value_or(std::chrono::seconds{}).count()),
0);
+ WriteSetting(QStringLiteral("sound_index"), Settings::values.sound_index, 1);
+
qt_config->endGroup();
}
diff --git a/src/yuzu/configuration/configure_system.cpp b/src/yuzu/configuration/configure_system.cpp
index e1b52f8d9..f9a5b4fbe 100644
--- a/src/yuzu/configuration/configure_system.cpp
+++ b/src/yuzu/configuration/configure_system.cpp
@@ -56,6 +56,7 @@ void ConfigureSystem::SetConfiguration() {
enabled = !Core::System::GetInstance().IsPoweredOn();
ui->combo_language->setCurrentIndex(Settings::values.language_index);
+ ui->combo_sound->setCurrentIndex(Settings::values.sound_index);
ui->rng_seed_checkbox->setChecked(Settings::values.rng_seed.has_value());
ui->rng_seed_edit->setEnabled(Settings::values.rng_seed.has_value());
@@ -81,6 +82,7 @@ void ConfigureSystem::ApplyConfiguration() {
}
Settings::values.language_index = ui->combo_language->currentIndex();
+ Settings::values.sound_index = ui->combo_sound->currentIndex();
if (ui->rng_seed_checkbox->isChecked()) {
Settings::values.rng_seed = ui->rng_seed_edit->text().toULongLong(nullptr, 16);