diff --git a/.gitmodules b/.gitmodules index 8c06da4..a0d45b5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -82,3 +82,6 @@ [submodule "plugins/AriaModules"] path = plugins/AriaModules url = https://github.com/CardinalModules/AriaModules.git +[submodule "plugins/BaconPlugs"] + path = plugins/BaconPlugs + url = https://github.com/CardinalModules/BaconPlugs.git diff --git a/plugins/BaconPlugs b/plugins/BaconPlugs new file mode 160000 index 0000000..2bc40e3 --- /dev/null +++ b/plugins/BaconPlugs @@ -0,0 +1 @@ +Subproject commit 2bc40e3a13ad4a9d79ad327abdfe012f6b410805 diff --git a/plugins/Makefile b/plugins/Makefile index fd93567..290733d 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -339,6 +339,13 @@ PLUGIN_FILES += AudibleInstruments/eurorack/streams/svf.cc PLUGIN_FILES += AudibleInstruments/eurorack/streams/vactrol.cc PLUGIN_FILES += AudibleInstruments/eurorack/streams/compressor.cc +# -------------------------------------------------------------- +# BaconPlugs + +PLUGIN_FILES += $(filter-out BaconPlugs/src/BaconPlugs.cpp,$(wildcard BaconPlugs/src/*.cpp)) +PLUGIN_FILES += $(wildcard BaconPlugs/libs/midifile/src/*.cpp) +PLUGIN_FILES += $(wildcard BaconPlugs/libs/open303-code/Source/DSPCode/*.cpp) + # -------------------------------------------------------------- # Befaco @@ -821,6 +828,18 @@ $(BUILD_DIR)/AudibleInstruments/%.o: AudibleInstruments/% -Wno-class-memaccess \ -Wno-unused-local-typedefs +$(BUILD_DIR)/BaconPlugs/%.cpp.o: BaconPlugs/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(BACON_CUSTOM),$(call custom_module_names,$(m),BaconPlugs)) \ + -DpluginInstance=pluginInstance__Bacon \ + -DDARK_BACON \ + -IBaconPlugs/libs/midifile/include \ + -IBaconPlugs/libs/open303-code/Source/DSPCode \ + -Wno-array-bounds \ + -Wno-strict-aliasing + $(BUILD_DIR)/Befaco/%.cpp.o: Befaco/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index d5623e2..12728a1 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -72,6 +72,13 @@ extern Model *modelBlank; // AudibleInstruments #include "AudibleInstruments/src/plugin.hpp" +// BaconPlugs +#define INCLUDE_COMPONENTS_HPP +#include "BaconPlugs/src/BaconPlugs.hpp" +#undef INCLUDE_COMPONENTS_HPP +#undef SCREW_WIDTH +#undef RACK_HEIGHT + // Befaco #define modelADSR modelBefacoADSR #define modelMixer modelBefacoMixer @@ -358,6 +365,7 @@ Plugin* pluginInstance__Aria; Plugin* pluginInstance__AS; Plugin* pluginInstance__Atelier; Plugin* pluginInstance__AudibleInstruments; +Plugin* pluginInstance__Bacon; Plugin* pluginInstance__Befaco; Plugin* pluginInstance__Bidoo; Plugin* pluginInstance__BogaudioModules; @@ -713,6 +721,39 @@ static void initStatic__AudibleInstruments() } } +static void initStatic__Bacon() +{ + Plugin* const p = new Plugin; + pluginInstance__Bacon = p; + + const StaticPluginLoader spl(p, "BaconPlugs"); + if (spl.ok()) + { + p->addModel(modelHarMoNee); + p->addModel(modelGlissinator); + p->addModel(modelPolyGnome); + p->addModel(modelQuantEyes); + p->addModel(modelSampleDelay); +#ifdef BUILD_SORTACHORUS + p->addModel(modelSortaChorus); +#endif + p->addModel(modelChipNoise); + p->addModel(modelChipWaves); + p->addModel(modelChipYourWave); + p->addModel(modelOpen303); +#ifdef BUILD_GENERICLSFR + p->addModel(modelGenericLFSR); +#endif + p->addModel(modelKarplusStrongPoly); + p->addModel(modelALingADing); + p->addModel(modelBitulator); +#ifdef BUILD_PHASER + p->addModel(modelPhaser); +#endif + p->addModel(modelPolyGenerator); + } +} + static void initStatic__Befaco() { Plugin* const p = new Plugin; @@ -1362,6 +1403,7 @@ void initStaticPlugins() initStatic__AS(); initStatic__Atelier(); initStatic__AudibleInstruments(); + initStatic__Bacon(); initStatic__Befaco(); initStatic__Bidoo(); initStatic__BogaudioModules();