evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang hates that I guess

Browse Source
This commit is contained in:
Kae 2024-12-31 15:26:01 +11:00
parent 9e3341f2f2
commit 4903d39eed
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/frontend/StarVoice.cpp
View File

@ -387,7 +387,7 @@ void Voice::mix(int16_t* buffer, size_t frameCount, unsigned channels) {
mix = true;
float volume = speaker->volume;
Array2F levels = speaker->channelVolumes;
std::array<float, 2> levels = speaker->channelVolumes;
for (size_t i = 0; i != samples; ++i)
sharedBuffer[i] += (int32_t)(speakerBuffer[i]) * levels[i % 2] * volume;
//Blends the weaker channel into the stronger one,
@ -438,14 +438,12 @@ void Voice::mix(int16_t* buffer, size_t frameCount, unsigned channels) {
void Voice::update(float, PositionalAttenuationFunction positionalAttenuationFunction) {
for (auto& entry : m_speakers) {
if (SpeakerPtr& speaker = entry.second) {
if (positionalAttenuationFunction) {
speaker->channelVolumes = {
1.0f - positionalAttenuationFunction(0, speaker->position, 1.0f),
1.0f - positionalAttenuationFunction(1, speaker->position, 1.0f)
};
}
else
speaker->channelVolumes = Vec2F::filled(1.0f);
if (positionalAttenuationFunction) {
speaker->channelVolumes = {
1.0f - positionalAttenuationFunction(0, speaker->position, 1.0f),
1.0f - positionalAttenuationFunction(1, speaker->position, 1.0f)};
} else
speaker->channelVolumes = {1.0f, 1.0f};
auto& dbHistory = speaker->dbHistory;
memmove(&dbHistory[1], &dbHistory[0], (dbHistory.size() - 1) * sizeof(float));

2
source/frontend/StarVoice.hpp
View File

@ -89,7 +89,7 @@ public:
atomic<bool> playing = 0;
atomic<float> decibelLevel = -96.0f;
atomic<float> volume = 1.0f;
atomic<Array<float, 2>> channelVolumes = Array<float, 2>::filled(1);
atomic<std::array<float, 2>> channelVolumes = std::array<float, 2>{1.0f, 1.0f};
unsigned int minimumPlaySamples = 4096;