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

Merge booboo between the PRs

Browse source
This commit is contained in:
Paul Ferrand 2021-02-12 10:16:39 +01:00
parent ce1dda54e6
commit b5cb624697
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/sfizz/Region.cpp
View file

@ -553,11 +553,9 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode)
if (!extendIfNecessary(filters, filterIndex + 1, Default::numFilters)) if (!extendIfNecessary(filters, filterIndex + 1, Default::numFilters))
return false; return false;
if (auto value = readOpcode(opcode.value, Default::filterCutoffModRange)) { const ModKey source = ModKey::createNXYZ(ModId::ChannelAftertouch);
const ModKey source = ModKey::createNXYZ(ModId::ChannelAftertouch); const ModKey target = ModKey::createNXYZ(ModId::FilCutoff, id, filterIndex);
const ModKey target = ModKey::createNXYZ(ModId::FilCutoff, id, filterIndex); getOrCreateConnection(source, target).sourceDepth = opcode.read(Default::filterCutoffMod);
getOrCreateConnection(source, target).sourceDepth = *value;
}
} }
break; break;
case hash("fil&_keytrack"): // also fil_keytrack case hash("fil&_keytrack"): // also fil_keytrack
@ -1532,7 +1530,6 @@ bool sfz::Region::registerNoteOff(int noteNumber, float velocity, float randValu
return false; return false;
} }
#include<iostream>
bool sfz::Region::registerCC(int ccNumber, float ccValue) noexcept bool sfz::Region::registerCC(int ccNumber, float ccValue) noexcept
{ {
ASSERT(ccValue >= 0.0f && ccValue <= 1.0f); ASSERT(ccValue >= 0.0f && ccValue <= 1.0f);