diff options
| author | Ameer J <52414509+ameerj@users.noreply.github.com> | 2021-07-16 21:24:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 21:24:43 +0200 |
| commit | 046de2cc4e7d4e42b44f397187e7c4601cb5cde8 (patch) | |
| tree | 7745f66bf4ae83e94b8ecfad2c941098ad5d7e49 | |
| parent | Merge pull request #6579 from ameerj/float-settings (diff) | |
| parent | configure_audio: Fix volume clamping to 0 (diff) | |
| download | yuzu-046de2cc4e7d4e42b44f397187e7c4601cb5cde8.tar yuzu-046de2cc4e7d4e42b44f397187e7c4601cb5cde8.tar.gz yuzu-046de2cc4e7d4e42b44f397187e7c4601cb5cde8.tar.bz2 yuzu-046de2cc4e7d4e42b44f397187e7c4601cb5cde8.tar.lz yuzu-046de2cc4e7d4e42b44f397187e7c4601cb5cde8.tar.xz yuzu-046de2cc4e7d4e42b44f397187e7c4601cb5cde8.tar.zst yuzu-046de2cc4e7d4e42b44f397187e7c4601cb5cde8.zip | |
| -rw-r--r-- | src/yuzu/configuration/configure_audio.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/yuzu/configuration/configure_audio.cpp b/src/yuzu/configuration/configure_audio.cpp index d8ba939d2..1d84bf4ed 100644 --- a/src/yuzu/configuration/configure_audio.cpp +++ b/src/yuzu/configuration/configure_audio.cpp @@ -47,8 +47,8 @@ void ConfigureAudio::SetConfiguration() { SetAudioDeviceFromDeviceID(); - const auto volume_value = Settings::values.volume.GetValue() * ui->volume_slider->maximum(); - ui->volume_slider->setValue(volume_value / 100); + const auto volume_value = static_cast<int>(Settings::values.volume.GetValue()); + ui->volume_slider->setValue(volume_value); 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 if (Settings::values.volume.UsingGlobal()) { - const s32 volume = ui->volume_slider->sliderPosition() / ui->volume_slider->maximum(); - Settings::values.volume.SetValue(static_cast<u8>(100 * volume)); + const auto volume = static_cast<u8>(ui->volume_slider->value()); + Settings::values.volume.SetValue(volume); } } else { if (ui->volume_combo_box->currentIndex() == 0) { Settings::values.volume.SetGlobal(true); } else { Settings::values.volume.SetGlobal(false); - const s32 volume = ui->volume_slider->sliderPosition() / ui->volume_slider->maximum(); - Settings::values.volume.SetValue(static_cast<u8>(100 * volume)); + const auto volume = static_cast<u8>(ui->volume_slider->value()); + Settings::values.volume.SetValue(volume); } } } |