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

Removed the constant CC switch check

Browse source
This commit is contained in:
paulfd 2019-08-30 00:18:59 +02:00
parent dd3c749e8d
commit 0147546f6a
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sources/Region.cpp
View file

@ -443,7 +443,7 @@ bool sfz::Region::parseOpcode(const Opcode& opcode)
bool sfz::Region::isSwitchedOn() const noexcept bool sfz::Region::isSwitchedOn() const noexcept
{ {
return keySwitched && previousKeySwitched && sequenceSwitched && pitchSwitched && bpmSwitched && aftertouchSwitched && allCCSwitched; return keySwitched && previousKeySwitched && sequenceSwitched && pitchSwitched && bpmSwitched && aftertouchSwitched && ccSwitched.all();
} }
bool sfz::Region::registerNoteOn(int channel, int noteNumber, uint8_t velocity, float randValue) noexcept bool sfz::Region::registerNoteOn(int channel, int noteNumber, uint8_t velocity, float randValue) noexcept
@ -539,16 +539,12 @@ bool sfz::Region::registerCC(int channel, int ccNumber, uint8_t ccValue) noexcep
if (!channelRange.containsWithEnd(channel)) if (!channelRange.containsWithEnd(channel))
return false; return false;
// TODO: we can probably
if (ccConditions.getWithDefault(ccNumber).containsWithEnd(ccValue)) if (ccConditions.getWithDefault(ccNumber).containsWithEnd(ccValue))
ccSwitched.set(ccNumber, true); ccSwitched.set(ccNumber, true);
else else
ccSwitched.set(ccNumber, false); ccSwitched.set(ccNumber, false);
if (ccSwitched.all())
allCCSwitched = true;
else
allCCSwitched = false;
if (ccTriggers.contains(ccNumber) && ccTriggers.at(ccNumber).containsWithEnd(ccValue)) if (ccTriggers.contains(ccNumber) && ccTriggers.at(ccNumber).containsWithEnd(ccValue))
return true; return true;
else else
@ -688,10 +684,7 @@ float sfz::Region::getNoteGain(int noteNumber, uint8_t velocity) noexcept
float sfz::Region::getCCGain(const sfz::CCValueArray& ccState) noexcept float sfz::Region::getCCGain(const sfz::CCValueArray& ccState) noexcept
{ {
float gain { 1.0f }; float gain { 1.0f };
if (amplitudeCC)
gain *= *amplitudeCC
// Crossfades due to CC states // Crossfades due to CC states
for (const auto& valuePair : crossfadeCCInRange) { for (const auto& valuePair : crossfadeCCInRange) {
const auto ccValue = ccState[valuePair.first]; const auto ccValue = ccState[valuePair.first];

1
sources/Region.h
View file

@ -135,7 +135,6 @@ private:
bool bpmSwitched { true }; bool bpmSwitched { true };
bool aftertouchSwitched { true }; bool aftertouchSwitched { true };
std::bitset<128> ccSwitched; std::bitset<128> ccSwitched;
bool allCCSwitched { true };
int activeNotesInRange { -1 }; int activeNotesInRange { -1 };
int sequenceCounter { 0 }; int sequenceCounter { 0 };