From e02a30f56cb2c81d7ba6a9fd4823475b927686f3 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Wed, 11 Nov 2020 14:04:06 +0100 Subject: [PATCH] Rename some internal functions related to used CCs --- src/sfizz/Synth.cpp | 62 ++++++++++++++++++++-------------------- src/sfizz/SynthPrivate.h | 6 ++-- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp index d2788663..cefacad2 100644 --- a/src/sfizz/Synth.cpp +++ b/src/sfizz/Synth.cpp @@ -683,7 +683,7 @@ void Synth::Impl::finalizeSfzLoad() std::bitset usedCCs; for (const RegionPtr& regionPtr : regions_) { const Region& region = *regionPtr; - updateUsedCCsFromRegion(usedCCs, region); + collectUsedCCsFromRegion(usedCCs, region); for (const Region::Connection& connection : region.connections) { if (connection.source.id() == ModId::Controller) usedCCs.set(connection.source.parameters().cc); @@ -1682,8 +1682,8 @@ std::bitset Synth::getUsedCCs() const noexcept Impl& impl = *impl_; std::bitset used; for (const Impl::RegionPtr& region : impl.regions_) - impl.updateUsedCCsFromRegion(used, *region); - impl.updateUsedCCsFromModulations(used, impl.resources_.modMatrix); + impl.collectUsedCCsFromRegion(used, *region); + impl.collectUsedCCsFromModulations(used, impl.resources_.modMatrix); return used; } @@ -1694,41 +1694,41 @@ void sfz::Synth::setBroadcastCallback(sfizz_receive_t* broadcast, void* data) impl.broadcastData = data; } -void Synth::Impl::updateUsedCCsFromRegion(std::bitset& usedCCs, const Region& region) +void Synth::Impl::collectUsedCCsFromRegion(std::bitset& usedCCs, const Region& region) { - updateUsedCCsFromCCMap(usedCCs, region.offsetCC); - updateUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccAttack); - updateUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccRelease); - updateUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccDecay); - updateUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccDelay); - updateUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccHold); - updateUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccStart); - updateUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccSustain); + collectUsedCCsFromCCMap(usedCCs, region.offsetCC); + collectUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccAttack); + collectUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccRelease); + collectUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccDecay); + collectUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccDelay); + collectUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccHold); + collectUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccStart); + collectUsedCCsFromCCMap(usedCCs, region.amplitudeEG.ccSustain); if (region.pitchEG) { - updateUsedCCsFromCCMap(usedCCs, region.pitchEG->ccAttack); - updateUsedCCsFromCCMap(usedCCs, region.pitchEG->ccRelease); - updateUsedCCsFromCCMap(usedCCs, region.pitchEG->ccDecay); - updateUsedCCsFromCCMap(usedCCs, region.pitchEG->ccDelay); - updateUsedCCsFromCCMap(usedCCs, region.pitchEG->ccHold); - updateUsedCCsFromCCMap(usedCCs, region.pitchEG->ccStart); - updateUsedCCsFromCCMap(usedCCs, region.pitchEG->ccSustain); + collectUsedCCsFromCCMap(usedCCs, region.pitchEG->ccAttack); + collectUsedCCsFromCCMap(usedCCs, region.pitchEG->ccRelease); + collectUsedCCsFromCCMap(usedCCs, region.pitchEG->ccDecay); + collectUsedCCsFromCCMap(usedCCs, region.pitchEG->ccDelay); + collectUsedCCsFromCCMap(usedCCs, region.pitchEG->ccHold); + collectUsedCCsFromCCMap(usedCCs, region.pitchEG->ccStart); + collectUsedCCsFromCCMap(usedCCs, region.pitchEG->ccSustain); } if (region.filterEG) { - updateUsedCCsFromCCMap(usedCCs, region.filterEG->ccAttack); - updateUsedCCsFromCCMap(usedCCs, region.filterEG->ccRelease); - updateUsedCCsFromCCMap(usedCCs, region.filterEG->ccDecay); - updateUsedCCsFromCCMap(usedCCs, region.filterEG->ccDelay); - updateUsedCCsFromCCMap(usedCCs, region.filterEG->ccHold); - updateUsedCCsFromCCMap(usedCCs, region.filterEG->ccStart); - updateUsedCCsFromCCMap(usedCCs, region.filterEG->ccSustain); + collectUsedCCsFromCCMap(usedCCs, region.filterEG->ccAttack); + collectUsedCCsFromCCMap(usedCCs, region.filterEG->ccRelease); + collectUsedCCsFromCCMap(usedCCs, region.filterEG->ccDecay); + collectUsedCCsFromCCMap(usedCCs, region.filterEG->ccDelay); + collectUsedCCsFromCCMap(usedCCs, region.filterEG->ccHold); + collectUsedCCsFromCCMap(usedCCs, region.filterEG->ccStart); + collectUsedCCsFromCCMap(usedCCs, region.filterEG->ccSustain); } - updateUsedCCsFromCCMap(usedCCs, region.ccConditions); - updateUsedCCsFromCCMap(usedCCs, region.ccTriggers); - updateUsedCCsFromCCMap(usedCCs, region.crossfadeCCInRange); - updateUsedCCsFromCCMap(usedCCs, region.crossfadeCCOutRange); + collectUsedCCsFromCCMap(usedCCs, region.ccConditions); + collectUsedCCsFromCCMap(usedCCs, region.ccTriggers); + collectUsedCCsFromCCMap(usedCCs, region.crossfadeCCInRange); + collectUsedCCsFromCCMap(usedCCs, region.crossfadeCCOutRange); } -void Synth::Impl::updateUsedCCsFromModulations(std::bitset& usedCCs, const ModMatrix& mm) +void Synth::Impl::collectUsedCCsFromModulations(std::bitset& usedCCs, const ModMatrix& mm) { class CCSourceCollector : public ModMatrix::KeyVisitor { public: diff --git a/src/sfizz/SynthPrivate.h b/src/sfizz/SynthPrivate.h index f65a9ae8..3c9569af 100644 --- a/src/sfizz/SynthPrivate.h +++ b/src/sfizz/SynthPrivate.h @@ -168,14 +168,14 @@ struct Synth::Impl final: public Parser::Listener { void finalizeSfzLoad(); template - static void updateUsedCCsFromCCMap(std::bitset& usedCCs, const CCMap map) noexcept + static void collectUsedCCsFromCCMap(std::bitset& usedCCs, const CCMap map) noexcept { for (auto& mod : map) usedCCs[mod.cc] = true; } - static void updateUsedCCsFromRegion(std::bitset& usedCCs, const Region& region); - static void updateUsedCCsFromModulations(std::bitset& usedCCs, const ModMatrix& mm); + static void collectUsedCCsFromRegion(std::bitset& usedCCs, const Region& region); + static void collectUsedCCsFromModulations(std::bitset& usedCCs, const ModMatrix& mm); /** * @brief Set the default value for a CC