configure_audio: Use u8 for volume value
This commit is contained in:
parent
5edc96f4a4
commit
386cd45f07
|
@ -103,7 +103,7 @@ float Volume() {
|
|||
if (values.audio_muted) {
|
||||
return 0.0f;
|
||||
}
|
||||
return values.volume.GetValue();
|
||||
return values.volume.GetValue() / 100.0f;
|
||||
}
|
||||
|
||||
void RestoreGlobalState(bool is_powered_on) {
|
||||
|
|
|
@ -278,7 +278,7 @@ struct Values {
|
|||
BasicSetting<std::string> sink_id{"auto", "output_engine"};
|
||||
BasicSetting<bool> audio_muted{false, "audio_muted"};
|
||||
Setting<bool> enable_audio_stretching{true, "enable_audio_stretching"};
|
||||
Setting<float> volume{1.0f, "volume"};
|
||||
Setting<u8> volume{100, "volume"};
|
||||
|
||||
// Core
|
||||
Setting<bool> use_multi_core{true, "use_multi_core"};
|
||||
|
|
|
@ -47,7 +47,8 @@ void ConfigureAudio::SetConfiguration() {
|
|||
|
||||
SetAudioDeviceFromDeviceID();
|
||||
|
||||
ui->volume_slider->setValue(Settings::values.volume.GetValue() * ui->volume_slider->maximum());
|
||||
const auto volume_value = Settings::values.volume.GetValue() * ui->volume_slider->maximum();
|
||||
ui->volume_slider->setValue(volume_value / 100);
|
||||
|
||||
ui->toggle_audio_stretching->setChecked(Settings::values.enable_audio_stretching.GetValue());
|
||||
|
||||
|
@ -112,18 +113,16 @@ void ConfigureAudio::ApplyConfiguration() {
|
|||
|
||||
// Guard if during game and set to game-specific value
|
||||
if (Settings::values.volume.UsingGlobal()) {
|
||||
Settings::values.volume.SetValue(
|
||||
static_cast<float>(ui->volume_slider->sliderPosition()) /
|
||||
ui->volume_slider->maximum());
|
||||
const s32 volume = ui->volume_slider->sliderPosition() / ui->volume_slider->maximum();
|
||||
Settings::values.volume.SetValue(static_cast<u8>(100 * volume));
|
||||
}
|
||||
} else {
|
||||
if (ui->volume_combo_box->currentIndex() == 0) {
|
||||
Settings::values.volume.SetGlobal(true);
|
||||
} else {
|
||||
Settings::values.volume.SetGlobal(false);
|
||||
Settings::values.volume.SetValue(
|
||||
static_cast<float>(ui->volume_slider->sliderPosition()) /
|
||||
ui->volume_slider->maximum());
|
||||
const s32 volume = ui->volume_slider->sliderPosition() / ui->volume_slider->maximum();
|
||||
Settings::values.volume.SetValue(static_cast<u8>(100 * volume));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -281,7 +281,7 @@ enable_audio_stretching =
|
|||
output_device =
|
||||
|
||||
# Output volume.
|
||||
# 1.0 (default): 100%, 0.0; mute
|
||||
# 100 (default): 100%, 0; mute
|
||||
volume =
|
||||
|
||||
[Data Storage]
|
||||
|
|
Reference in New Issue