summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorKelebek1 <eeeedddccc@hotmail.co.uk>2022-08-12 17:57:29 +0200
committerKelebek1 <eeeedddccc@hotmail.co.uk>2022-08-12 17:57:29 +0200
commitb25090d96064cf4658c29ef186a609cd841788db (patch)
tree5c469a7a7809ab3dba67f51f79a5de05b3acc092 /src/common
parentMerge pull request #8647 from Docteh/default_dark (diff)
downloadyuzu-b25090d96064cf4658c29ef186a609cd841788db.tar
yuzu-b25090d96064cf4658c29ef186a609cd841788db.tar.gz
yuzu-b25090d96064cf4658c29ef186a609cd841788db.tar.bz2
yuzu-b25090d96064cf4658c29ef186a609cd841788db.tar.lz
yuzu-b25090d96064cf4658c29ef186a609cd841788db.tar.xz
yuzu-b25090d96064cf4658c29ef186a609cd841788db.tar.zst
yuzu-b25090d96064cf4658c29ef186a609cd841788db.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/settings.cpp2
-rw-r--r--src/common/settings.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index 1c7b6dfae..7282a45d3 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -105,7 +105,7 @@ float Volume() {
if (values.audio_muted) {
return 0.0f;
}
- return values.volume.GetValue() / 100.0f;
+ return values.volume.GetValue() / static_cast<f32>(values.volume.GetDefault());
}
void UpdateRescalingInfo() {
diff --git a/src/common/settings.h b/src/common/settings.h
index 1079cf8cb..14ed9b237 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -374,7 +374,7 @@ struct Values {
Setting<std::string> audio_output_device_id{"auto", "output_device"};
Setting<std::string> audio_input_device_id{"auto", "input_device"};
Setting<bool> audio_muted{false, "audio_muted"};
- SwitchableSetting<u8, true> volume{100, 0, 100, "volume"};
+ SwitchableSetting<u8, true> volume{100, 0, 200, "volume"};
Setting<bool> dump_audio_commands{false, "dump_audio_commands"};
// Core