RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 06:17:35 +00:00
Code Issues Activity Actions

AudioServer: Explicitly cast between numeric types in the mixer

Browse source
This commit is contained in:
kleines Filmröllchen 2022-06-15 21:15:58 +02:00 • committed by Linus Groh
parent cb8e37d436
commit 746d3c1131
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Services/AudioServer/Mixer.cpp
View file

@ -97,7 +97,7 @@ void Mixer::mix()
if (queue->is_muted()) if (queue->is_muted())
continue; continue;
sample.log_multiply(SAMPLE_HEADROOM); sample.log_multiply(SAMPLE_HEADROOM);
sample.log_multiply(queue->volume()); sample.log_multiply(static_cast<float>(queue->volume()));
mixed_sample += sample; mixed_sample += sample;
} }
} }
@ -115,14 +115,14 @@ void Mixer::mix()
if (m_main_volume < 0.01) if (m_main_volume < 0.01)
mixed_sample = Audio::Sample { 0 }; mixed_sample = Audio::Sample { 0 };
else else
mixed_sample.log_multiply(m_main_volume); mixed_sample.log_multiply(static_cast<float>(m_main_volume));
mixed_sample.clip(); mixed_sample.clip();
LittleEndian<i16> out_sample; LittleEndian<i16> out_sample;
out_sample = mixed_sample.left * NumericLimits<i16>::max(); out_sample = static_cast<i16>(mixed_sample.left * NumericLimits<i16>::max());
stream << out_sample; stream << out_sample;
out_sample = mixed_sample.right * NumericLimits<i16>::max(); out_sample = static_cast<i16>(mixed_sample.right * NumericLimits<i16>::max());
stream << out_sample; stream << out_sample;
} }