diff --git a/.gitmodules b/.gitmodules index cd38bd3..bfb4290 100644 --- a/.gitmodules +++ b/.gitmodules @@ -73,9 +73,6 @@ [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 cab9035..5376ea9 100644 --- a/README.md +++ b/README.md @@ -108,7 +108,6 @@ At the moment the following 3rd-party modules are provided: - repelzen - Sonus Modular - Valley -- ZZC (*) - ZetaCarinae (*) Might be removed soon due to license conflicts diff --git a/plugins/Makefile b/plugins/Makefile index 794e596..e05e34a 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -634,9 +634,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 deleted file mode 160000 index cb151af..0000000 --- a/plugins/ZZC +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cb151afd226d9d544b8872cb5cb7d3713fc18e00 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index e588675..3654f12 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -449,12 +449,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 @@ -502,7 +502,7 @@ Plugin* pluginInstance__repelzen; Plugin* pluginInstance__sonusmodular; Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__ZetaCarinaeModules; -Plugin* pluginInstance__ZZC; +// Plugin* pluginInstance__ZZC; #endif // NOPLUGINS namespace rack { @@ -1743,27 +1743,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() @@ -1804,7 +1804,7 @@ void initStaticPlugins() initStatic__sonusmodular(); initStatic__ValleyAudio(); initStatic__ZetaCarinaeModules(); - initStatic__ZZC(); + // initStatic__ZZC(); #endif // NOPLUGINS }