Merge pull request #1103 from paulfd/eg-lfo-target

Add LFO frequency as an EG target
sfztools · Jul 20, 2022 · 03dda27 · 03dda27
2 parents 1eb728c + 935be2e
commit 03dda27
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git a/src/sfizz/Region.cpp b/src/sfizz/Region.cpp
@@ -1657,6 +1657,19 @@ bool sfz::Region::parseEGOpcodeV2(const Opcode& opcode)
         break;
     }
 
+    case hash("eg&_freq_lfo&"):
+        if (lfos.size() < opcode.parameters[1] - 1)
+            return false;
+        EG_target(ModKey::createNXYZ(ModId::LFOFrequency, id, opcode.parameters[1] - 1), Default::lfoFreqMod);
+        break;
+
+    case_any_ccN("eg&_freq_lfo&"):
+        if (lfos.size() < opcode.parameters[1] - 1)
+            return false;
+        EG_target_cc(ModKey::createNXYZ(ModId::LFOFrequency, id, opcode.parameters[1] - 1), Default::lfoFreqMod);
+        break;
+
+
     default:
         return false;
     }

diff --git a/src/sfizz/modulations/ModId.cpp b/src/sfizz/modulations/ModId.cpp
@@ -150,6 +150,8 @@ int ModIds::flags(ModId id) noexcept
         return kModIsPerVoice|kModIsAdditive;
     case ModId::EGEqBandwidthDepth:
         return kModIsPerVoice|kModIsAdditive;
+    case ModId::EGLFOFreqDepth:
+        return kModIsPerVoice|kModIsAdditive;
 
         // unknown
     default:

diff --git a/src/sfizz/modulations/ModId.h b/src/sfizz/modulations/ModId.h
@@ -89,6 +89,7 @@ enum class ModId : int {
     EGEqGainDepth,
     EGEqFrequencyDepth,
     EGEqBandwidthDepth,
+    EGLFOFreqDepth,
 
     _TargetsEnd,
     // [/targets] --------------------------------------------------------------

diff --git a/src/sfizz/modulations/ModKey.cpp b/src/sfizz/modulations/ModKey.cpp
@@ -220,6 +220,8 @@ std::string ModKey::toString() const
         return absl::StrCat("EGEqFrequencyDepth {", region_.number(), ", N=", 1 + params_.N, ", X=", 1 + params_.X, "}");
     case ModId::EGEqBandwidthDepth:
         return absl::StrCat("EGEqBandwidthDepth {", region_.number(), ", N=", 1 + params_.N, ", X=", 1 + params_.X, "}");
+    case ModId::EGLFOFreqDepth:
+        return absl::StrCat("EGLFOFreqDepth {", region_.number(), ", N=", 1 + params_.N, ", X=", 1 + params_.X, "}");
 
     default:
         return {};
@@ -334,6 +336,8 @@ ModKey ModKey::getSourceDepthKey(ModKey source, ModKey target)
             return ModKey::createNXYZ(ModId::EGEqFrequencyDepth, region, tp.N, tp.X);
         case ModId::EqBandwidth:
             return ModKey::createNXYZ(ModId::EGEqBandwidthDepth, region, tp.N, tp.X);
+        case ModId:: LFOFrequency:
+            return ModKey::createNXYZ(ModId::EGLFOFreqDepth, region, tp.N, tp.X);
         default:
             break;
         }