artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #6657 from Morph1984/settings-fixes

Browse source 
configure_audio: Fix volume clamping to 0
This commit is contained in:
Ameer J 2021-07-16 15:24:43 -04:00 committed by GitHub
parent 3cd3230295 b804f77fa5
commit 046de2cc4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,8 +47,8 @@ void ConfigureAudio::SetConfiguration() {
SetAudioDeviceFromDeviceID(); SetAudioDeviceFromDeviceID();
const auto volume_value = Settings::values.volume.GetValue() * ui->volume_slider->maximum(); const auto volume_value = static_cast<int>(Settings::values.volume.GetValue());
ui->volume_slider->setValue(volume_value / 100); ui->volume_slider->setValue(volume_value);
ui->toggle_audio_stretching->setChecked(Settings::values.enable_audio_stretching.GetValue()); ui->toggle_audio_stretching->setChecked(Settings::values.enable_audio_stretching.GetValue());
@ -113,16 +113,16 @@ void ConfigureAudio::ApplyConfiguration() {
// Guard if during game and set to game-specific value // Guard if during game and set to game-specific value
if (Settings::values.volume.UsingGlobal()) { if (Settings::values.volume.UsingGlobal()) {
const s32 volume = ui->volume_slider->sliderPosition() / ui->volume_slider->maximum(); const auto volume = static_cast<u8>(ui->volume_slider->value());
Settings::values.volume.SetValue(static_cast<u8>(100 * volume)); Settings::values.volume.SetValue(volume);
} }
} else { } else {
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 {
Settings::values.volume.SetGlobal(false); Settings::values.volume.SetGlobal(false);
const s32 volume = ui->volume_slider->sliderPosition() / ui->volume_slider->maximum(); const auto volume = static_cast<u8>(ui->volume_slider->value());
Settings::values.volume.SetValue(static_cast<u8>(100 * volume)); Settings::values.volume.SetValue(volume);
} }
} }
} }