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

Add the filter targets

Browse source
This commit is contained in:
Jean Pierre Cimalando 2021-04-01 15:03:01 +02:00
parent 779cf2afff
commit d8d877b2f1
1 changed files with 114 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

142
src/sfizz/Region.cpp
View file

@ -1175,14 +1175,15 @@ bool sfz::Region::parseLFOOpcodeV2(const Opcode& opcode)
processGenericCc(opcode, spec, depth); processGenericCc(opcode, spec, depth);
return true; return true;
}; };
auto LFO_EG_filter_EQ_target = [this, &opcode, lfoNumber](ModId sourceId, ModId targetId, const OpcodeSpec<float>& spec) -> bool { auto ensureFilter = [this, &opcode]() {
const unsigned index = opcode.parameters.size() == 2 ? opcode.parameters.back() - 1 : 0; ASSERT(opcode.parameters.size() >= 2);
if (!extendIfNecessary(filters, index + 1, Default::numFilters)) const unsigned index = opcode.parameters[1] - 1;
return false; return extendIfNecessary(filters, index + 1, Default::numFilters);
const ModKey source = ModKey::createNXYZ(sourceId, id, lfoNumber); };
const ModKey target = ModKey::createNXYZ(targetId, id, index); auto ensureEQ = [this, &opcode]() {
getOrCreateConnection(source, target).sourceDepth = opcode.read(spec); ASSERT(opcode.parameters.size() >= 2);
return true; const unsigned index = opcode.parameters[1] - 1;
return extendIfNecessary(equalizers, index + 1, Default::numEQs);
}; };
// //
@ -1302,22 +1303,64 @@ bool sfz::Region::parseLFOOpcodeV2(const Opcode& opcode)
LFO_target_cc(ModKey::createNXYZ(ModId::Volume, id), Default::volumeMod); LFO_target_cc(ModKey::createNXYZ(ModId::Volume, id), Default::volumeMod);
break; break;
case hash("lfo&_cutoff&"): case hash("lfo&_cutoff&"):
LFO_EG_filter_EQ_target(ModId::LFO, ModId::FilCutoff, Default::filterCutoffMod); if (!ensureFilter())
return false;
LFO_target(ModKey::createNXYZ(ModId::FilCutoff, id, opcode.parameters[1] - 1), Default::filterCutoffMod);
break;
case_any_ccN("lfo&_cutoff&"):
if (!ensureFilter())
return false;
LFO_target_cc(ModKey::createNXYZ(ModId::FilCutoff, id, opcode.parameters[1] - 1), Default::filterCutoffMod);
break; break;
case hash("lfo&_resonance&"): case hash("lfo&_resonance&"):
LFO_EG_filter_EQ_target(ModId::LFO, ModId::FilResonance, Default::filterResonanceMod); if (!ensureFilter())
return false;
LFO_target(ModKey::createNXYZ(ModId::FilResonance, id, opcode.parameters[1] - 1), Default::filterResonanceMod);
break;
case_any_ccN("lfo&_resonance&"):
if (!ensureFilter())
return false;
LFO_target_cc(ModKey::createNXYZ(ModId::FilResonance, id, opcode.parameters[1] - 1), Default::filterResonanceMod);
break; break;
case hash("lfo&_fil&gain"): case hash("lfo&_fil&gain"):
LFO_EG_filter_EQ_target(ModId::LFO, ModId::FilGain, Default::filterGainMod); if (!ensureFilter())
return false;
LFO_target(ModKey::createNXYZ(ModId::FilGain, id, opcode.parameters[1] - 1), Default::filterGainMod);
break;
case_any_ccN("lfo&_fil&gain"):
if (!ensureFilter())
return false;
LFO_target_cc(ModKey::createNXYZ(ModId::FilGain, id, opcode.parameters[1] - 1), Default::filterGainMod);
break; break;
case hash("lfo&_eq&gain"): case hash("lfo&_eq&gain"):
LFO_EG_filter_EQ_target(ModId::LFO, ModId::EqGain, Default::eqGainMod); if (!ensureEQ())
return false;
LFO_target(ModKey::createNXYZ(ModId::EqGain, id, opcode.parameters[1] - 1), Default::eqGainMod);
break;
case_any_ccN("lfo&_eq&gain"):
if (!ensureEQ())
return false;
LFO_target_cc(ModKey::createNXYZ(ModId::EqGain, id, opcode.parameters[1] - 1), Default::eqGainMod);
break; break;
case hash("lfo&_eq&freq"): case hash("lfo&_eq&freq"):
LFO_EG_filter_EQ_target(ModId::LFO, ModId::EqFrequency, Default::eqFrequencyMod); if (!ensureEQ())
return false;
LFO_target(ModKey::createNXYZ(ModId::EqFrequency, id, opcode.parameters[1] - 1), Default::eqFrequencyMod);
break;
case_any_ccN("lfo&_eq&freq"):
if (!ensureEQ())
return false;
LFO_target_cc(ModKey::createNXYZ(ModId::EqFrequency, id, opcode.parameters[1] - 1), Default::eqFrequencyMod);
break; break;
case hash("lfo&_eq&bw"): case hash("lfo&_eq&bw"):
LFO_EG_filter_EQ_target(ModId::LFO, ModId::EqBandwidth, Default::eqBandwidthMod); if (!ensureEQ())
return false;
LFO_target(ModKey::createNXYZ(ModId::EqBandwidth, id, opcode.parameters[1] - 1), Default::eqBandwidthMod);
break;
case_any_ccN("lfo&_eq&bw"):
if (!ensureEQ())
return false;
LFO_target_cc(ModKey::createNXYZ(ModId::EqBandwidth, id, opcode.parameters[1] - 1), Default::eqBandwidthMod);
break; break;
default: default:
@ -1359,14 +1402,15 @@ bool sfz::Region::parseEGOpcodeV2(const Opcode& opcode)
processGenericCc(opcode, spec, depth); processGenericCc(opcode, spec, depth);
return true; return true;
}; };
auto LFO_EG_filter_EQ_target = [this, &opcode, egNumber](ModId sourceId, ModId targetId, const OpcodeSpec<float>& spec) -> bool { auto ensureFilter = [this, &opcode]() {
const unsigned index = opcode.parameters.size() == 2 ? opcode.parameters.back() - 1 : 0; ASSERT(opcode.parameters.size() >= 2);
if (!extendIfNecessary(filters, index + 1, Default::numFilters)) const unsigned index = opcode.parameters[1] - 1;
return false; return extendIfNecessary(filters, index + 1, Default::numFilters);
const ModKey source = ModKey::createNXYZ(sourceId, id, egNumber); };
const ModKey target = ModKey::createNXYZ(targetId, id, index); auto ensureEQ = [this, &opcode]() {
getOrCreateConnection(source, target).sourceDepth = opcode.read(spec); ASSERT(opcode.parameters.size() >= 2);
return true; const unsigned index = opcode.parameters[1] - 1;
return extendIfNecessary(equalizers, index + 1, Default::numEQs);
}; };
// //
@ -1436,22 +1480,64 @@ bool sfz::Region::parseEGOpcodeV2(const Opcode& opcode)
EG_target_cc(ModKey::createNXYZ(ModId::Volume, id), Default::volumeMod); EG_target_cc(ModKey::createNXYZ(ModId::Volume, id), Default::volumeMod);
break; break;
case hash("eg&_cutoff&"): case hash("eg&_cutoff&"):
LFO_EG_filter_EQ_target(ModId::Envelope, ModId::FilCutoff, Default::filterCutoffMod); if (!ensureFilter())
return false;
EG_target(ModKey::createNXYZ(ModId::FilCutoff, id, opcode.parameters[1] - 1), Default::filterCutoffMod);
break;
case_any_ccN("eg&_cutoff&"):
if (!ensureFilter())
return false;
EG_target_cc(ModKey::createNXYZ(ModId::FilCutoff, id, opcode.parameters[1] - 1), Default::filterCutoffMod);
break; break;
case hash("eg&_resonance&"): case hash("eg&_resonance&"):
LFO_EG_filter_EQ_target(ModId::Envelope, ModId::FilResonance, Default::filterResonanceMod); if (!ensureFilter())
return false;
EG_target(ModKey::createNXYZ(ModId::FilResonance, id, opcode.parameters[1] - 1), Default::filterResonanceMod);
break;
case_any_ccN("eg&_resonance&"):
if (!ensureFilter())
return false;
EG_target_cc(ModKey::createNXYZ(ModId::FilResonance, id, opcode.parameters[1] - 1), Default::filterResonanceMod);
break; break;
case hash("eg&_fil&gain"): case hash("eg&_fil&gain"):
LFO_EG_filter_EQ_target(ModId::Envelope, ModId::FilGain, Default::filterGainMod); if (!ensureFilter())
return false;
EG_target(ModKey::createNXYZ(ModId::FilGain, id, opcode.parameters[1] - 1), Default::filterGainMod);
break;
case_any_ccN("eg&_fil&gain"):
if (!ensureFilter())
return false;
EG_target_cc(ModKey::createNXYZ(ModId::FilGain, id, opcode.parameters[1] - 1), Default::filterGainMod);
break; break;
case hash("eg&_eq&gain"): case hash("eg&_eq&gain"):
LFO_EG_filter_EQ_target(ModId::Envelope, ModId::EqGain, Default::eqGainMod); if (!ensureEQ())
return false;
EG_target(ModKey::createNXYZ(ModId::EqGain, id, opcode.parameters[1] - 1), Default::eqGainMod);
break;
case_any_ccN("eg&_eq&gain"):
if (!ensureEQ())
return false;
EG_target_cc(ModKey::createNXYZ(ModId::EqGain, id, opcode.parameters[1] - 1), Default::eqGainMod);
break; break;
case hash("eg&_eq&freq"): case hash("eg&_eq&freq"):
LFO_EG_filter_EQ_target(ModId::Envelope, ModId::EqFrequency, Default::eqFrequencyMod); if (!ensureEQ())
return false;
EG_target(ModKey::createNXYZ(ModId::EqFrequency, id, opcode.parameters[1] - 1), Default::eqFrequencyMod);
break;
case_any_ccN("eg&_eq&freq"):
if (!ensureEQ())
return false;
EG_target_cc(ModKey::createNXYZ(ModId::EqFrequency, id, opcode.parameters[1] - 1), Default::eqFrequencyMod);
break; break;
case hash("eg&_eq&bw"): case hash("eg&_eq&bw"):
LFO_EG_filter_EQ_target(ModId::Envelope, ModId::EqBandwidth, Default::eqBandwidthMod); if (!ensureEQ())
return false;
EG_target(ModKey::createNXYZ(ModId::EqBandwidth, id, opcode.parameters[1] - 1), Default::eqBandwidthMod);
break;
case_any_ccN("eg&_eq&bw"):
if (!ensureEQ())
return false;
EG_target_cc(ModKey::createNXYZ(ModId::EqBandwidth, id, opcode.parameters[1] - 1), Default::eqBandwidthMod);
break; break;
case hash("eg&_ampeg"): case hash("eg&_ampeg"):