summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-07-16 00:03:11 +0200
committerGitHub <noreply@github.com>2021-07-16 00:03:11 +0200
commit3cd3230295a4752c57df1364bc14b17ffdcde762 (patch)
treed94ce6ea5cf9d5d7ff384454ffe7203bd31774c8 /src/common
parentMerge pull request #6635 from ameerj/intel-vk-sm3dw (diff)
parentconfigure_input: Use u8 for mouse sensitivity (diff)
downloadyuzu-3cd3230295a4752c57df1364bc14b17ffdcde762.tar
yuzu-3cd3230295a4752c57df1364bc14b17ffdcde762.tar.gz
yuzu-3cd3230295a4752c57df1364bc14b17ffdcde762.tar.bz2
yuzu-3cd3230295a4752c57df1364bc14b17ffdcde762.tar.lz
yuzu-3cd3230295a4752c57df1364bc14b17ffdcde762.tar.xz
yuzu-3cd3230295a4752c57df1364bc14b17ffdcde762.tar.zst
yuzu-3cd3230295a4752c57df1364bc14b17ffdcde762.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/settings.cpp2
-rw-r--r--src/common/settings.h10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
index e1973af85..bf5514386 100644
--- a/src/common/settings.cpp
+++ b/src/common/settings.cpp
@@ -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) {
diff --git a/src/common/settings.h b/src/common/settings.h
index 71d0f864f..832358036 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -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"};
@@ -336,9 +336,9 @@ struct Values {
Setting<bool> use_fast_gpu_time{true, "use_fast_gpu_time"};
Setting<bool> use_caches_gc{false, "use_caches_gc"};
- Setting<float> bg_red{0.0f, "bg_red"};
- Setting<float> bg_green{0.0f, "bg_green"};
- Setting<float> bg_blue{0.0f, "bg_blue"};
+ Setting<u8> bg_red{0, "bg_red"};
+ Setting<u8> bg_green{0, "bg_green"};
+ Setting<u8> bg_blue{0, "bg_blue"};
// System
Setting<std::optional<u32>> rng_seed{std::optional<u32>(), "rng_seed"};
@@ -368,7 +368,7 @@ struct Values {
"udp_input_servers"};
BasicSetting<bool> mouse_panning{false, "mouse_panning"};
- BasicSetting<float> mouse_panning_sensitivity{1.0f, "mouse_panning_sensitivity"};
+ BasicSetting<u8> mouse_panning_sensitivity{1, "mouse_panning_sensitivity"};
BasicSetting<bool> mouse_enabled{false, "mouse_enabled"};
std::string mouse_device;
MouseButtonsRaw mouse_buttons;