diff --git a/.gitmodules b/.gitmodules index c3a1684..edc5587 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,6 +73,9 @@ [submodule "plugins/mscHack"] path = plugins/mscHack url = https://github.com/CardinalModules/mscHack.git +[submodule "plugins/ZZC"] + path = plugins/ZZC + url = https://github.com/zezic/ZZC.git [submodule "plugins/repelzen"] path = plugins/repelzen url = https://github.com/wiqid/repelzen.git diff --git a/README.md b/README.md index 0f8ede0..49beb97 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,7 @@ At the moment the following 3rd-party modules are provided: - repelzen - Sonus Modular - Valley +- ZZC (*) - ZetaCarinae Additionally Cardinal provides its own modules for DAW/Host automation, time position and internal plugin hosting. diff --git a/plugins/Makefile b/plugins/Makefile index 2d21cb3..e1ba83d 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -648,9 +648,9 @@ PLUGIN_FILES += $(filter-out ZetaCarinaeModules/src/plugin.cpp,$(wildcard ZetaCa # -------------------------------------------------------------- # ZZC -# PLUGIN_FILES += $(filter-out ZZC/src/ZZC.cpp,$(wildcard ZZC/src/*.cpp)) -# PLUGIN_FILES += ZZC/src/dsp/Wavetable.cpp -# PLUGIN_FILES += ZZC/src/filetypes/WavSupport.cpp +PLUGIN_FILES += $(filter-out ZZC/src/ZZC.cpp,$(wildcard ZZC/src/*.cpp)) +PLUGIN_FILES += ZZC/src/dsp/Wavetable.cpp +PLUGIN_FILES += ZZC/src/filetypes/WavSupport.cpp # modules/types which are present in other plugins ZZC_CUSTOM = Clock LowFrequencyOscillator diff --git a/plugins/ZZC b/plugins/ZZC new file mode 160000 index 0000000..cb151af --- /dev/null +++ b/plugins/ZZC @@ -0,0 +1 @@ +Subproject commit cb151afd226d9d544b8872cb5cb7d3713fc18e00 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 371e454..bfe8608 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -470,12 +470,12 @@ extern Model* modelMaude_221; #include "ZetaCarinaeModules/src/plugin.hpp" // ZZC -// #define DISPLAYS_H -// #define ZZC_SHARED_H -// #define ZZC_WIDGETS_H -// #define modelClock modelZZCClock -// #include "ZZC/src/ZZC.hpp" -// #undef modelClock +#define DISPLAYS_H +#define ZZC_SHARED_H +#define ZZC_WIDGETS_H +#define modelClock modelZZCClock +#include "ZZC/src/ZZC.hpp" +#undef modelClock #endif // NOPLUGINS @@ -525,7 +525,7 @@ Plugin* pluginInstance__repelzen; Plugin* pluginInstance__sonusmodular; Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__ZetaCarinaeModules; -// Plugin* pluginInstance__ZZC; +Plugin* pluginInstance__ZZC; #endif // NOPLUGINS namespace rack { @@ -1804,27 +1804,27 @@ static void initStatic__ZetaCarinaeModules() } } -// static void initStatic__ZZC() -// { -// Plugin* p = new Plugin; -// pluginInstance__ZZC = p; -// -// const StaticPluginLoader spl(p, "ZZC"); -// if (spl.ok()) -// { -// #define modelClock modelZZCClock -// p->addModel(modelClock); -// p->addModel(modelDivider); -// p->addModel(modelFN3); -// p->addModel(modelSCVCA); -// p->addModel(modelSH8); -// p->addModel(modelSRC); -// p->addModel(modelDiv); -// p->addModel(modelDivExp); -// p->addModel(modelPolygate); -// #undef modelClock -// } -// } +static void initStatic__ZZC() +{ + Plugin* p = new Plugin; + pluginInstance__ZZC = p; + + const StaticPluginLoader spl(p, "ZZC"); + if (spl.ok()) + { +#define modelClock modelZZCClock + p->addModel(modelClock); + p->addModel(modelDivider); + p->addModel(modelFN3); + p->addModel(modelSCVCA); + p->addModel(modelSH8); + p->addModel(modelSRC); + p->addModel(modelDiv); + p->addModel(modelDivExp); + p->addModel(modelPolygate); +#undef modelClock + } +} #endif // NOPLUGINS void initStaticPlugins() @@ -1867,7 +1867,7 @@ void initStaticPlugins() initStatic__sonusmodular(); initStatic__ValleyAudio(); initStatic__ZetaCarinaeModules(); - // initStatic__ZZC(); + initStatic__ZZC(); #endif // NOPLUGINS }