From 392dd069a54aca3483d4e8fb81421de1614fe9a0 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Sat, 10 Apr 2021 12:40:54 +0200 Subject: [PATCH 1/2] Add cutoff_polyaft --- src/sfizz/Region.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp index ef5da208..bae67ab8 100644 --- a/src/sfizz/Region.cpp +++ b/src/sfizz/Region.cpp @@ -590,6 +590,17 @@ bool sfz::Region::parseOpcode(const Opcode& rawOpcode, bool cleanOpcode) getOrCreateConnection(source, target).sourceDepth = opcode.read(Default::filterCutoffMod); } break; + case hash("cutoff&_polyaft"): + { + const auto filterIndex = opcode.parameters.front() - 1; + if (!extendIfNecessary(filters, filterIndex + 1, Default::numFilters)) + return false; + + const ModKey source = ModKey::createNXYZ(ModId::PolyAftertouch, id); + const ModKey target = ModKey::createNXYZ(ModId::FilCutoff, id, filterIndex); + getOrCreateConnection(source, target).sourceDepth = opcode.read(Default::filterCutoffMod); + } + break; case hash("fil&_keytrack"): // also fil_keytrack { const auto filterIndex = opcode.parameters.front() - 1; From e8f1160988ec070dc872052f705a0550b07459e4 Mon Sep 17 00:00:00 2001 From: Jean Pierre Cimalando Date: Sat, 10 Apr 2021 14:06:40 +0200 Subject: [PATCH 2/2] Remove old NOLINTs [ci skip] --- src/sfizz/Region.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp index bae67ab8..2649a369 100644 --- a/src/sfizz/Region.cpp +++ b/src/sfizz/Region.cpp @@ -942,7 +942,7 @@ bool sfz::Region::parseLFOOpcode(const Opcode& opcode, LFODescription& lfo) getOrCreateConnection(ModKey::createNXYZ(ModId::ChannelAftertouch), sourceDepthKey).sourceDepth = opcode.read(depthModSpec); break; - case_any_lfo("depthpolyaft"): // NOLINT bugprone-branch-clone + case_any_lfo("depthpolyaft"): getOrCreateConnection(sourceKey, targetKey).sourceDepthMod = sourceDepthKey; getOrCreateConnection(ModKey::createNXYZ(ModId::PolyAftertouch, id), sourceDepthKey).sourceDepth = opcode.read(depthModSpec); @@ -956,11 +956,11 @@ bool sfz::Region::parseLFOOpcode(const Opcode& opcode, LFODescription& lfo) case_any_lfo_any_ccN("freq"): // also freqcc& processGenericCc(opcode, Default::lfoFreqMod, lfo.freqKey); break; - case_any_lfo("freqchanaft"): // NOLINT bugprone-branch-clone + case_any_lfo("freqchanaft"): getOrCreateConnection(ModKey::createNXYZ(ModId::ChannelAftertouch), lfo.freqKey).sourceDepth = opcode.read(Default::lfoFreqMod); break; - case_any_lfo("freqpolyaft"): // NOLINT bugprone-branch-clone + case_any_lfo("freqpolyaft"): getOrCreateConnection(ModKey::createNXYZ(ModId::PolyAftertouch, id), lfo.freqKey).sourceDepth = opcode.read(Default::lfoFreqMod); break;