summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2023-03-13 22:41:30 +0100
committerMorph <39850852+Morph1984@users.noreply.github.com>2023-03-13 22:41:30 +0100
commit4c678cfbc8157e630e8ddf68f5c2687e7550a6db (patch)
treeb1867d6edce4721f44282a4bb0efa7faacba2ed4
parentMerge pull request #9939 from german77/vibration (diff)
downloadyuzu-4c678cfbc8157e630e8ddf68f5c2687e7550a6db.tar
yuzu-4c678cfbc8157e630e8ddf68f5c2687e7550a6db.tar.gz
yuzu-4c678cfbc8157e630e8ddf68f5c2687e7550a6db.tar.bz2
yuzu-4c678cfbc8157e630e8ddf68f5c2687e7550a6db.tar.lz
yuzu-4c678cfbc8157e630e8ddf68f5c2687e7550a6db.tar.xz
yuzu-4c678cfbc8157e630e8ddf68f5c2687e7550a6db.tar.zst
yuzu-4c678cfbc8157e630e8ddf68f5c2687e7550a6db.zip
-rw-r--r--src/yuzu/configuration/configure_audio.cpp16
-rw-r--r--src/yuzu/configuration/configure_audio.ui2
2 files changed, 9 insertions, 9 deletions
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp
index 4bec51260..fcd6d61a0 100644
--- a/src/yuzu/configuration/configure_audio.cpp
+++ b/src/yuzu/configuration/configure_audio.cpp
@@ -54,16 +54,17 @@ void ConfigureAudio::SetConfiguration() {
if (Settings::values.volume.UsingGlobal()) {
ui->volume_combo_box->setCurrentIndex(0);
ui->volume_slider->setEnabled(false);
- ui->combo_sound->setCurrentIndex(Settings::values.sound_index.GetValue());
} else {
ui->volume_combo_box->setCurrentIndex(1);
ui->volume_slider->setEnabled(true);
- ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index);
}
- ConfigurationShared::SetHighlight(ui->volume_layout,
- !Settings::values.volume.UsingGlobal());
+ ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index);
ConfigurationShared::SetHighlight(ui->mode_label,
!Settings::values.sound_index.UsingGlobal());
+ ConfigurationShared::SetHighlight(ui->volume_layout,
+ !Settings::values.volume.UsingGlobal());
+ } else {
+ ui->combo_sound->setCurrentIndex(Settings::values.sound_index.GetValue());
}
SetVolumeIndicatorText(ui->volume_slider->sliderPosition());
}
@@ -182,14 +183,13 @@ void ConfigureAudio::RetranslateUI() {
void ConfigureAudio::SetupPerGameUI() {
if (Settings::IsConfiguringGlobal()) {
+ ui->combo_sound->setEnabled(Settings::values.sound_index.UsingGlobal());
ui->volume_slider->setEnabled(Settings::values.volume.UsingGlobal());
- // ui->combo_sound->setEnabled(Settings::values.sound_index.UsingGlobal());
-
return;
}
- // ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->label_sound,
- // Settings::values.sound_index.GetValue(true));
+ ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->mode_label,
+ Settings::values.sound_index.GetValue(true));
connect(ui->volume_combo_box, qOverload<int>(&QComboBox::activated), this, [this](int index) {
ui->volume_slider->setEnabled(index == 1);
diff --git a/src/yuzu/configuration/configure_audio.ui b/src/yuzu/configuration/configure_audio.ui
index bcd5d8c2b..4128c83ad 100644
--- a/src/yuzu/configuration/configure_audio.ui
+++ b/src/yuzu/configuration/configure_audio.ui
@@ -67,7 +67,7 @@
<item>
<widget class="QLabel" name="mode_label">
<property name="text">
- <string>Sound Ouput Mode:</string>
+ <string>Sound Output Mode:</string>
</property>
</widget>
</item>