BogaudioModules

commit 9e81e71d5ea7850fcbc82afa178b95b473739093
parent a18c0d037b5b5eebe3dc459153cf82e715684b47
Author: Matt Demanett <matt@demanett.net>
Date:   Mon, 18 Jun 2018 19:59:55 -0400

Drop experimental flag from new modules; reorganize the order the appear on the moudle picker.

Diffstat:
M
src/FMOp.hpp
 | 
2
+-
M
src/Switch.cpp
 | 
2
+-
M
src/bogaudio.cpp
 | 
87
++++++++++++++++++++++++++++++++++---------------------------------------------

3 files changed, 39 insertions(+), 52 deletions(-)
diff --git a/src/FMOp.hpp b/src/FMOp.hpp
@@ -68,7 +68,7 @@ struct FMOp : Module {
 	float _maxFrequency = 0.0f;
 	float _buffer[oversample];
 	float _oversampleMix = 0.0f;
-	ADSR _envelope;
+	dsp::ADSR _envelope;
 	Phasor _phasor;
 	SineTableOscillator _sineTable;
 	CICDecimator _decimator;
diff --git a/src/Switch.cpp b/src/Switch.cpp
@@ -59,4 +59,4 @@ struct SwitchWidget : ModuleWidget {
 	}
 };
 
-Model* modelSwitch = createModel<Switch, SwitchWidget>("Bogaudio-Switch", "Switch",  "signal switch", SWITCH_TAG);
+Model* modelSwitch = createModel<Switch, SwitchWidget>("Bogaudio-Switch", "Switch",  "signal router", SWITCH_TAG);
diff --git a/src/bogaudio.cpp b/src/bogaudio.cpp
@@ -1,47 +1,43 @@
 
 #include "bogaudio.hpp"
 
-#include "VCO.hpp"
-#include "XCO.hpp"
+#include "ADSR.hpp"
 #include "Additator.hpp"
-#include "FMOp.hpp"
-#include "LFO.hpp"
-#include "EightFO.hpp"
-
-#include "Shaper.hpp"
-#include "ShaperPlus.hpp"
-#include "DADSRH.hpp"
-#include "DADSRHPlus.hpp"
-
 #include "Analyzer.hpp"
-
-#include "RM.hpp"
-#include "VCM.hpp"
-#include "Mix4.hpp"
-#include "Mix8.hpp"
-
-#include "ADSR.hpp"
 #include "Bool.hpp"
 #include "CVD.hpp"
-#include "Detune.hpp"
+#include "DADSRH.hpp"
+#include "DADSRHPlus.hpp"
 #include "DGate.hpp"
+#include "Detune.hpp"
+#include "EightFO.hpp"
+#include "FMOp.hpp"
 #include "FlipFlop.hpp"
 #include "Follow.hpp"
+#include "LFO.hpp"
 #include "Lag.hpp"
 #include "Manual.hpp"
+#include "Mix4.hpp"
+#include "Mix8.hpp"
 #include "Mult.hpp"
 #include "Noise.hpp"
 #include "Offset.hpp"
 #include "Pan.hpp"
+#include "RM.hpp"
 #include "Reftone.hpp"
 #include "SampleHold.hpp"
+#include "Shaper.hpp"
+#include "ShaperPlus.hpp"
 #include "Stack.hpp"
 #include "Sums.hpp"
 #include "Switch.hpp"
 #include "VCA.hpp"
 #include "VCAL.hpp"
 #include "VCAmp.hpp"
+#include "VCM.hpp"
+#include "VCO.hpp"
 #include "VU.hpp"
+#include "XCO.hpp"
 #include "XFade.hpp"
 
 #include "Test.hpp"
@@ -63,59 +59,50 @@ void init(rack::Plugin *p) {
 	p->addModel(modelXCO);
 	p->addModel(modelAdditator);
 	p->addModel(modelFMOp);
+
 	p->addModel(modelLFO);
 	p->addModel(modelEightFO);
 
-	p->addModel(modelShaper);
-	p->addModel(modelShaperPlus);
 	p->addModel(modelDADSRH);
 	p->addModel(modelDADSRHPlus);
+	p->addModel(modelDGate);
+	p->addModel(modelShaper);
+	p->addModel(modelShaperPlus);
+	p->addModel(modelADSR);
+	p->addModel(modelFollow);
 
-	p->addModel(modelAnalyzer);
-
-#ifdef EXPERIMENTAL
-	p->addModel(modelRM);
-	p->addModel(modelVCM);
 	p->addModel(modelMix4);
 	p->addModel(modelMix8);
+	p->addModel(modelVCM);
+	p->addModel(modelPan);
+	p->addModel(modelXFade);
+	p->addModel(modelVCA);
+#if 0
+	p->addModel(modelVCAL);
 #endif
+	p->addModel(modelVCAmp);
+
+	p->addModel(modelAnalyzer);
+	p->addModel(modelVU);
+
+	p->addModel(modelDetune);
+	p->addModel(modelStack);
+	p->addModel(modelReftone);
 
-#ifdef EXPERIMENTAL
-	p->addModel(modelADSR);
 	p->addModel(modelBool);
 	p->addModel(modelCVD);
-#endif
-	p->addModel(modelDetune);
-	p->addModel(modelDGate);
-#ifdef EXPERIMENTAL
 	p->addModel(modelFlipFlop);
-	p->addModel(modelFollow);
 	p->addModel(modelLag);
-#endif
 	p->addModel(modelManual);
-#ifdef EXPERIMENTAL
 	p->addModel(modelMult);
-#endif
 	p->addModel(modelNoise);
 	p->addModel(modelOffset);
-#ifdef EXPERIMENTAL
-	p->addModel(modelPan);
-#endif
-	p->addModel(modelReftone);
 	p->addModel(modelSampleHold);
-	p->addModel(modelStack);
-#ifdef EXPERIMENTAL
 	p->addModel(modelSums);
-#endif
 	p->addModel(modelSwitch);
-	p->addModel(modelVCA);
-#if 0
-	p->addModel(modelVCAL);
-#endif
+
 #ifdef EXPERIMENTAL
-	p->addModel(modelVCAmp);
-	p->addModel(modelVU);
-	p->addModel(modelXFade);
+	p->addModel(modelRM);
 #endif
 
 #ifdef TEST