sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the conditions which are made redundant

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-09-11 17:58:42 +02:00
parent aaa51f6dfe
commit 89893503be
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/sfizz/modulations/ModMatrix.cpp
View file

@ -243,7 +243,6 @@ void ModMatrix::initVoice(NumericId<Voice> voiceId, NumericId<Region> regionId,
const auto idNumber = static_cast<size_t>(regionId.number()); const auto idNumber = static_cast<size_t>(regionId.number());
for (auto idx: impl.sourceIndicesForRegion_[idNumber]) { for (auto idx: impl.sourceIndicesForRegion_[idNumber]) {
const auto& source = impl.sources_[idx]; const auto& source = impl.sources_[idx];
if (source.key.flags() & kModIsPerVoice)
source.gen->init(source.key, voiceId, delay); source.gen->init(source.key, voiceId, delay);
} }
} }
@ -257,7 +256,6 @@ void ModMatrix::releaseVoice(NumericId<Voice> voiceId, NumericId<Region> regionI
const auto idNumber = static_cast<size_t>(regionId.number()); const auto idNumber = static_cast<size_t>(regionId.number());
for (auto idx: impl.sourceIndicesForRegion_[idNumber]) { for (auto idx: impl.sourceIndicesForRegion_[idNumber]) {
const auto& source = impl.sources_[idx]; const auto& source = impl.sources_[idx];
if (source.key.flags() & kModIsPerVoice)
source.gen->release(source.key, voiceId, delay); source.gen->release(source.key, voiceId, delay);
} }
} }
@ -303,13 +301,11 @@ void ModMatrix::beginVoice(NumericId<Voice> voiceId, NumericId<Region> regionId)
const auto idNumber = static_cast<size_t>(regionId.number()); const auto idNumber = static_cast<size_t>(regionId.number());
for (auto idx: impl.sourceIndicesForRegion_[idNumber]) { for (auto idx: impl.sourceIndicesForRegion_[idNumber]) {
auto& source = impl.sources_[idx]; auto& source = impl.sources_[idx];
if (source.key.flags() & kModIsPerVoice)
source.bufferReady = false; source.bufferReady = false;
} }
for (auto idx: impl.targetIndicesForRegion_[idNumber]) { for (auto idx: impl.targetIndicesForRegion_[idNumber]) {
auto& target = impl.targets_[idx]; auto& target = impl.targets_[idx];
if (target.key.flags() & kModIsPerVoice)
target.bufferReady = false; target.bufferReady = false;
} }
} }
@ -329,12 +325,10 @@ void ModMatrix::endVoice()
for (auto idx: impl.sourceIndicesForRegion_[idNumber]) { for (auto idx: impl.sourceIndicesForRegion_[idNumber]) {
const auto& source = impl.sources_[idx]; const auto& source = impl.sources_[idx];
if (!source.bufferReady) { if (!source.bufferReady) {
if (source.key.flags() & kModIsPerVoice) {
absl::Span<float> buffer(source.buffer.data(), numFrames); absl::Span<float> buffer(source.buffer.data(), numFrames);
source.gen->generateDiscarded(source.key, voiceId, buffer); source.gen->generateDiscarded(source.key, voiceId, buffer);
} }
} }
}
impl.currentVoiceId_ = {}; impl.currentVoiceId_ = {};
impl.currentRegionId_ = {}; impl.currentRegionId_ = {};