N-archive/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9951 from Morph1984/save

Browse source 
configure_audio: Fix output mode setting not saving
This commit is contained in:
bunnei 2023-03-13 18:49:14 -07:00 committed by GitHub
commit 05f26e1337
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/yuzu/configuration/configure_audio.cpp
View file

@ -54,16 +54,17 @@ void ConfigureAudio::SetConfiguration() {
if (Settings::values.volume.UsingGlobal()) { if (Settings::values.volume.UsingGlobal()) {
ui->volume_combo_box->setCurrentIndex(0); ui->volume_combo_box->setCurrentIndex(0);
ui->volume_slider->setEnabled(false); ui->volume_slider->setEnabled(false);
ui->combo_sound->setCurrentIndex(Settings::values.sound_index.GetValue());
} else { } else {
ui->volume_combo_box->setCurrentIndex(1); ui->volume_combo_box->setCurrentIndex(1);
ui->volume_slider->setEnabled(true); ui->volume_slider->setEnabled(true);
ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index);
} }
ConfigurationShared::SetHighlight(ui->volume_layout, ConfigurationShared::SetPerGameSetting(ui->combo_sound, &Settings::values.sound_index);
!Settings::values.volume.UsingGlobal());
ConfigurationShared::SetHighlight(ui->mode_label, ConfigurationShared::SetHighlight(ui->mode_label,
!Settings::values.sound_index.UsingGlobal()); !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()); SetVolumeIndicatorText(ui->volume_slider->sliderPosition());
} }
@ -182,14 +183,13 @@ void ConfigureAudio::RetranslateUI() {
void ConfigureAudio::SetupPerGameUI() { void ConfigureAudio::SetupPerGameUI() {
if (Settings::IsConfiguringGlobal()) { if (Settings::IsConfiguringGlobal()) {
ui->combo_sound->setEnabled(Settings::values.sound_index.UsingGlobal());
ui->volume_slider->setEnabled(Settings::values.volume.UsingGlobal()); ui->volume_slider->setEnabled(Settings::values.volume.UsingGlobal());
// ui->combo_sound->setEnabled(Settings::values.sound_index.UsingGlobal());
return; return;
} }
// ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->label_sound, ConfigurationShared::SetColoredComboBox(ui->combo_sound, ui->mode_label,
// Settings::values.sound_index.GetValue(true)); Settings::values.sound_index.GetValue(true));
connect(ui->volume_combo_box, qOverload<int>(&QComboBox::activated), this, [this](int index) { connect(ui->volume_combo_box, qOverload<int>(&QComboBox::activated), this, [this](int index) {
ui->volume_slider->setEnabled(index == 1); ui->volume_slider->setEnabled(index == 1);

2
src/yuzu/configuration/configure_audio.ui
View file

@ -67,7 +67,7 @@
<item> <item>
<widget class="QLabel" name="mode_label"> <widget class="QLabel" name="mode_label">
<property name="text"> <property name="text">
<string>Sound Ouput Mode:</string> <string>Sound Output Mode:</string>
</property> </property>
</widget> </widget>
</item> </item>