summaryrefslogtreecommitdiff
path: root/servers/audio_server.cpp
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-02-03 10:05:34 +0100
committerGitHub <noreply@github.com>2021-02-03 10:05:34 +0100
commit3a3af0279b1ed7c3b40136cdd7db1f54e09b88e2 (patch)
tree4525b1babec36496d19b44f9ef6c2cb217956d3c /servers/audio_server.cpp
parent0f327f0d65384d635ca9137bd9c7983936027296 (diff)
parenta2b3a73e2d0c2b9e9badeab28fef26565a9ec3f2 (diff)
Merge pull request #45658 from RandomShaper/fix_frozen_peak
Make audio bus channels' peak volume consistent
Diffstat (limited to 'servers/audio_server.cpp')
-rw-r--r--servers/audio_server.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp
index d4f7876b4b..16c6a26595 100644
--- a/servers/audio_server.cpp
+++ b/servers/audio_server.cpp
@@ -401,6 +401,7 @@ void AudioServer::_mix_step() {
for (int k = 0; k < bus->channels.size(); k++) {
if (!bus->channels[k].active) {
+ bus->channels.write[k].peak_volume = AudioFrame(AUDIO_MIN_PEAK_DB, AUDIO_MIN_PEAK_DB);
continue;
}
@@ -434,7 +435,7 @@ void AudioServer::_mix_step() {
}
}
- bus->channels.write[k].peak_volume = AudioFrame(Math::linear2db(peak.l + 0.0000000001), Math::linear2db(peak.r + 0.0000000001));
+ bus->channels.write[k].peak_volume = AudioFrame(Math::linear2db(peak.l + AUDIO_PEAK_OFFSET), Math::linear2db(peak.r + AUDIO_PEAK_OFFSET));
if (!bus->channels[k].used) {
//see if any audio is contained, because channel was not used