brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove ZZC modules due to license conflict

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-12-12 13:17:30 +00:00
parent 1d9d22d7b4
commit 48a20826c1
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
5 changed files with 32 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -73,9 +73,6 @@
[submodule "plugins/mscHack"] [submodule "plugins/mscHack"]
path = plugins/mscHack path = plugins/mscHack
url = https://github.com/CardinalModules/mscHack.git url = https://github.com/CardinalModules/mscHack.git
[submodule "plugins/ZZC"]
path = plugins/ZZC
url = https://github.com/zezic/ZZC.git
[submodule "plugins/repelzen"] [submodule "plugins/repelzen"]
path = plugins/repelzen path = plugins/repelzen
url = https://github.com/wiqid/repelzen.git url = https://github.com/wiqid/repelzen.git

1
README.md
View file

@ -108,7 +108,6 @@ At the moment the following 3rd-party modules are provided:
- repelzen - repelzen
- Sonus Modular - Sonus Modular
- Valley - Valley
- ZZC (*)
- ZetaCarinae - ZetaCarinae
(*) Might be removed soon due to license conflicts (*) Might be removed soon due to license conflicts

6
plugins/Makefile
View file

@ -634,9 +634,9 @@ PLUGIN_FILES += $(filter-out ZetaCarinaeModules/src/plugin.cpp,$(wildcard ZetaCa
# -------------------------------------------------------------- # --------------------------------------------------------------
# ZZC # ZZC
PLUGIN_FILES += $(filter-out ZZC/src/ZZC.cpp,$(wildcard ZZC/src/*.cpp)) # PLUGIN_FILES += $(filter-out ZZC/src/ZZC.cpp,$(wildcard ZZC/src/*.cpp))
PLUGIN_FILES += ZZC/src/dsp/Wavetable.cpp # PLUGIN_FILES += ZZC/src/dsp/Wavetable.cpp
PLUGIN_FILES += ZZC/src/filetypes/WavSupport.cpp # PLUGIN_FILES += ZZC/src/filetypes/WavSupport.cpp
# modules/types which are present in other plugins # modules/types which are present in other plugins
ZZC_CUSTOM = Clock LowFrequencyOscillator ZZC_CUSTOM = Clock LowFrequencyOscillator

1
plugins/ZZC

@ -1 +0,0 @@
Subproject commit cb151afd226d9d544b8872cb5cb7d3713fc18e00

58
plugins/plugins.cpp
View file

@ -449,12 +449,12 @@ extern Model *modelMaude_221;
#include "ZetaCarinaeModules/src/plugin.hpp" #include "ZetaCarinaeModules/src/plugin.hpp"
// ZZC // ZZC
#define DISPLAYS_H // #define DISPLAYS_H
#define ZZC_SHARED_H // #define ZZC_SHARED_H
#define ZZC_WIDGETS_H // #define ZZC_WIDGETS_H
#define modelClock modelZZCClock // #define modelClock modelZZCClock
#include "ZZC/src/ZZC.hpp" // #include "ZZC/src/ZZC.hpp"
#undef modelClock // #undef modelClock
#endif // NOPLUGINS #endif // NOPLUGINS
@ -502,7 +502,7 @@ Plugin* pluginInstance__repelzen;
Plugin* pluginInstance__sonusmodular; Plugin* pluginInstance__sonusmodular;
Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__ValleyAudio;
Plugin* pluginInstance__ZetaCarinaeModules; Plugin* pluginInstance__ZetaCarinaeModules;
Plugin* pluginInstance__ZZC; // Plugin* pluginInstance__ZZC;
#endif // NOPLUGINS #endif // NOPLUGINS
namespace rack { namespace rack {
@ -1743,27 +1743,27 @@ static void initStatic__ZetaCarinaeModules()
} }
} }
static void initStatic__ZZC() // static void initStatic__ZZC()
{ // {
Plugin* p = new Plugin; // Plugin* p = new Plugin;
pluginInstance__ZZC = p; // pluginInstance__ZZC = p;
//
const StaticPluginLoader spl(p, "ZZC"); // const StaticPluginLoader spl(p, "ZZC");
if (spl.ok()) // if (spl.ok())
{ // {
#define modelClock modelZZCClock // #define modelClock modelZZCClock
p->addModel(modelClock); // p->addModel(modelClock);
p->addModel(modelDivider); // p->addModel(modelDivider);
p->addModel(modelFN3); // p->addModel(modelFN3);
p->addModel(modelSCVCA); // p->addModel(modelSCVCA);
p->addModel(modelSH8); // p->addModel(modelSH8);
p->addModel(modelSRC); // p->addModel(modelSRC);
p->addModel(modelDiv); // p->addModel(modelDiv);
p->addModel(modelDivExp); // p->addModel(modelDivExp);
p->addModel(modelPolygate); // p->addModel(modelPolygate);
#undef modelClock // #undef modelClock
} // }
} // }
#endif // NOPLUGINS #endif // NOPLUGINS
void initStaticPlugins() void initStaticPlugins()
@ -1804,7 +1804,7 @@ void initStaticPlugins()
initStatic__sonusmodular(); initStatic__sonusmodular();
initStatic__ValleyAudio(); initStatic__ValleyAudio();
initStatic__ZetaCarinaeModules(); initStatic__ZetaCarinaeModules();
initStatic__ZZC(); // initStatic__ZZC();
#endif // NOPLUGINS #endif // NOPLUGINS
} }