summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar bunnei2019-01-26 21:21:04 -0500
committerGravatar GitHub2019-01-26 21:21:04 -0500
commit6957bac03cfc6a0ca4ca81c21dff52f2aa98d8ff (patch)
treefa8b8426d50594af177ce0c9d955b1415066b966 /src
parentMerge pull request #1927 from ReinUsesLisp/shader-ir (diff)
parentdsp_interface: fix sound being played while volume is 0 (diff)
downloadyuzu-6957bac03cfc6a0ca4ca81c21dff52f2aa98d8ff.tar.gz
yuzu-6957bac03cfc6a0ca4ca81c21dff52f2aa98d8ff.tar.xz
yuzu-6957bac03cfc6a0ca4ca81c21dff52f2aa98d8ff.zip
Merge pull request #2059 from FearlessTobi/port-4601
Port citra-emu/citra#4601: "dsp_interface: fix sound being played while volume is 0"
Diffstat (limited to 'src')
-rw-r--r--src/audio_core/stream.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/audio_core/stream.cpp b/src/audio_core/stream.cpp
index 874673c4e..4ce2d374e 100644
--- a/src/audio_core/stream.cpp
+++ b/src/audio_core/stream.cpp
@@ -68,7 +68,7 @@ static void VolumeAdjustSamples(std::vector<s16>& samples) {
68 } 68 }
69 69
70 // Implementation of a volume slider with a dynamic range of 60 dB 70 // Implementation of a volume slider with a dynamic range of 60 dB
71 const float volume_scale_factor{std::exp(6.90775f * volume) * 0.001f}; 71 const float volume_scale_factor = volume == 0 ? 0 : std::exp(6.90775f * volume) * 0.001f;
72 for (auto& sample : samples) { 72 for (auto& sample : samples) {
73 sample = static_cast<s16>(sample * volume_scale_factor); 73 sample = static_cast<s16>(sample * volume_scale_factor);
74 } 74 }