missing plugin_files, model and remove HetrickCV from custom/dep.cpp

Wasted-Audio · Mar 1, 2024 · 8f3f063 · 8f3f063
1 parent a2d7184
commit 8f3f063
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 73 deletions.
diff --git a/plugins/Makefile b/plugins/Makefile
@@ -741,6 +741,7 @@ HAMPTONHARMONICS_CUSTOM = Arp Progress
 
 PLUGIN_FILES += $(filter-out HetrickCV/src/HetrickCV.cpp,$(wildcard HetrickCV/src/*.cpp))
 PLUGIN_FILES += $(wildcard HetrickCV/src/DSP/*.cpp)
+PLUGIN_FILES += $(wildcard HetrickCV/src/DSP/Phasors/*.cpp)
 PLUGIN_FILES += $(wildcard HetrickCV/Gamma/src/arr.cpp)
 PLUGIN_FILES += $(wildcard HetrickCV/Gamma/src/Domain.cpp)
 PLUGIN_FILES += $(wildcard HetrickCV/Gamma/src/scl.cpp)

diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp
@@ -430,39 +430,40 @@ extern Model* modelGingerbread;
 extern Model* modelLogicCombine;
 extern Model* modelMidSide;
 extern Model* modelMinMax;
-extern Model *modelPhaseDrivenSequencer;
-extern Model *modelPhaseDrivenSequencer32;
-extern Model *modelPhasorAnalyzer;
-extern Model *modelPhasorBurstGen;
-extern Model *modelPhasorDivMult;
-extern Model *modelPhasorEuclidean;
-extern Model *modelPhasorGates;
-extern Model *modelPhasorGates32;
-extern Model *modelPhasorGates64;
-extern Model *modelPhasorGen;
-extern Model *modelPhasorGeometry;
-extern Model *modelPhasorHumanizer;
-extern Model *modelPhasorMixer;
-extern Model *modelPhasorOctature;
-extern Model *modelPhasorQuadrature;
-extern Model *modelPhasorRandom;
-extern Model *modelPhasorRanger;
-extern Model *modelPhasorReset;
-extern Model *modelPhasorRhythmGroup;
-extern Model *modelPhasorShape;
-extern Model *modelPhasorShift;
-extern Model *modelPhasorStutter;
-extern Model *modelPhasorSubstepShape;
-extern Model *modelPhasorSwing;
-extern Model *modelPhasorTimetable;
-extern Model *modelPhasorToClock;
-extern Model *modelPhasorToLFO;
-extern Model *modelPhasorToWaveforms;
-extern Model *modelProbability;
+extern Model* modelPhaseDrivenSequencer;
+extern Model* modelPhaseDrivenSequencer32;
+extern Model* modelPhasorAnalyzer;
+extern Model* modelPhasorBurstGen;
+extern Model* modelPhasorDivMult;
+extern Model* modelPhasorEuclidean;
+extern Model* modelPhasorGates;
+extern Model* modelPhasorGates32;
+extern Model* modelPhasorGates64;
+extern Model* modelPhasorGen;
+extern Model* modelPhasorGeometry;
+extern Model* modelPhasorHumanizer;
+extern Model* modelPhasorMixer;
+extern Model* modelPhasorOctature;
+extern Model* modelPhasorQuadrature;
+extern Model* modelPhasorRandom;
+extern Model* modelPhasorRanger;
+extern Model* modelPhasorReset;
+extern Model* modelPhasorRhythmGroup;
+extern Model* modelPhasorShape;
+extern Model* modelPhasorShift;
+extern Model* modelPhasorStutter;
+extern Model* modelPhasorSubstepShape;
+extern Model* modelPhasorSwing;
+extern Model* modelPhasorTimetable;
+extern Model* modelPhasorToClock;
+extern Model* modelPhasorToLFO;
+extern Model* modelPhasorToWaveforms;
+extern Model* modelProbability;
 extern Model* modelRandomGates;
 extern Model* modelRotator;
 extern Model* modelRungler;
 extern Model* modelScanner;
+extern Model* modelVectorMix;
 extern Model* modelWaveshape;
 extern Model* modelXYToPolar;
 #undef modelASR
@@ -2214,6 +2215,7 @@ static void initStatic__HetrickCV()
         p->addModel(modelRotator);
         p->addModel(modelRungler);
         p->addModel(modelScanner);
+        p->addModel(modelVectorMix);
         p->addModel(modelWaveshape);
         p->addModel(modelXYToPolar);
 #undef modelASR

diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp
@@ -66,7 +66,6 @@ enum DarkMode {
     kModeDHE,
     kModeDrumKit,
     kModeESeries,
-    kModeHetrickCV,
     kModeJW,
     kModeLilacLoop,
     kModeLittleUtils,
@@ -261,49 +260,6 @@ static const struct {
     // Custom, runtime dark mode used with permission
     { kModeESeries,"/ESeries/res/E340.svg", {}, -1 },
     // CC0-1.0
-    { kModeHetrickCV, "/HetrickCV/res/1OpChaos.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/2OpChaos.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/2To4.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/3OpChaos.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/ASR.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/AToD.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/BinaryGate.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/BinaryNoise.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Bitshift.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Boolean3.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/ChaoticAttractors.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/ClockedNoise.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Comparator.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Contrast.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Crackle.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/DataCompander.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Delta.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/DToA.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Dust.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Exponent.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/FBSineChaos.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/FlipFlop.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/FlipPan.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/GateJunction.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Gingerbread.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/LogicCombiner.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/LogicInverter.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/MidSide.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/MinMax.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/RandomGates.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Rotator.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Rungler.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Scanner.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/TrigShaper.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Waveshape.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/XYToPolar.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel1.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel2.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel3.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel5.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel6.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel7.svg", {}, -1},
-    { kModeHetrickCV, "/HetrickCV/res/Blanks/BlankPanel8.svg", {}, -1},
     // BSD-3-Clause
     { kModeJW, "/JW-Modules/res/Add5.svg", {}, -1 },
     { kModeJW, "/JW-Modules/res/BlankPanel1hp.svg", {}, -1 },