From 591adabe6af33d67372662b5d42381281b50cf31 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 9 Mar 2022 12:44:23 +0000 Subject: [PATCH] Remove dintree, artwork license issues --- README.md | 1 - docs/LICENSES.md | 2 -- plugins/Dintree | 1 - plugins/Makefile | 15 --------------- plugins/plugins.cpp | 25 ------------------------- 5 files changed, 44 deletions(-) delete mode 160000 plugins/Dintree diff --git a/README.md b/README.md index 2bf06d0..72ac8ad 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,6 @@ At the moment the following 3rd-party modules are provided: - Catro/Modulo - cf - ChowDSP -- Dintree Virtual - DrumKit - E-Series - ExpertSleepers Encoders diff --git a/docs/LICENSES.md b/docs/LICENSES.md index ae1258f..bde0c0c 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -31,7 +31,6 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | Catro/Modulo | BSD-3-Clause | | | cf | BSD-3-Clause | | | ChowDSP | GPL-3.0-or-later | | -| Dintree | GPL-3.0-or-later | | | DrumKit | CC0-1.0 | | | E-Series | GPL-3.0-or-later | | | ExpertSleepers Encoders | MIT | | @@ -131,7 +130,6 @@ Below is a list of artwork licenses from plugins | cf/VT323-Regular.ttf | OFL-1.1-no-RFN | | | ChowDSP/* | GPL-3.0-or-later | Same license as source code | | ChowDSP/fonts/RobotoCondensed-*.ttf | Apache-2.0 | | -| Dintree/* | GPL-3.0-or-later | No artwork specific license provided | | DrumKit/* | CC0-1.0 | | | DrumKit/component/NovaMono.ttf | OFL-1.1-RFN | | | E-Series/* | Custom | Copyright © Synthesis Technology, [used and distributed with permission](LICENSE-PERMISSIONS.md#eseries-paul-schreiber--synthtech) | diff --git a/plugins/Dintree b/plugins/Dintree deleted file mode 160000 index 51a01f2..0000000 --- a/plugins/Dintree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 51a01f2d14988a41060f25ba203b38e6f6767605 diff --git a/plugins/Makefile b/plugins/Makefile index 7b19d25..0e7d629 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -474,13 +474,6 @@ CATROMODULO_CUSTOM = LowFrequencyOscillator NumDisplayWidget PLUGIN_FILES += $(filter-out cf/src/plugin.cpp,$(wildcard cf/src/*.cpp)) -# -------------------------------------------------------------- -# Dintree - -PLUGIN_FILES += $(filter-out Dintree/src/plugin.cpp,$(wildcard Dintree/src/*.cpp)) -PLUGIN_FILES += $(wildcard Dintree/src/components/*.cpp) -PLUGIN_FILES += $(wildcard Dintree/src/utils/*.cpp) - # -------------------------------------------------------------- # DrumKit @@ -1392,14 +1385,6 @@ $(BUILD_DIR)/ChowDSP/%.cpp.o: ChowDSP/%.cpp -IChowDSP/lib/chowdsp_utils/DSP/WDF \ -Wno-deprecated-copy -$(BUILD_DIR)/Dintree/%.cpp.o: Dintree/%.cpp - -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" - @echo "Compiling $<" - $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ - $(foreach m,$(DINTREE_CUSTOM),$(call custom_module_names,$(m),Dintree)) \ - -DpluginInstance=pluginInstance__Dintree \ - -DSKIP_MINGW_FORMAT - $(BUILD_DIR)/DrumKit/%.cpp.o: DrumKit/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 8b13777..1fe6926 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -290,9 +290,6 @@ extern Model* modelTestVCF; #include "ChowDSP/src/plugin.cpp" #undef init -// Dintree -#include "Dintree/src/plugin.hpp" - // DrumKit #include "DrumKit/src/DrumKit.hpp" void setupSamples(); @@ -725,7 +722,6 @@ Plugin* pluginInstance__BogaudioModules; Plugin* pluginInstance__CatroModulo; Plugin* pluginInstance__cf; Plugin* pluginInstance__ChowDSP; -Plugin* pluginInstance__Dintree; extern Plugin* pluginInstance__DrumKit; Plugin* pluginInstance__ESeries; Plugin* pluginInstance__ExpertSleepersEncoders; @@ -1512,26 +1508,6 @@ static void initStatic__ChowDSP() } } -static void initStatic__Dintree() -{ - Plugin* const p = new Plugin; - pluginInstance__Dintree = p; - - const StaticPluginLoader spl(p, "Dintree"); - if (spl.ok()) - { - p->addModel(modelV100_Scanner); - p->addModel(modelV101_Dual_Envelope); - p->addModel(modelV102_Output_Mixer); - p->addModel(modelV103_Reverb_Delay); - p->addModel(modelV104_Four_Vs); - p->addModel(modelV105_Quad_CV_Proc); - p->addModel(modelV107_Dual_Slew); - p->addModel(modelV201_Tri_Comparator); - p->addModel(modelV218_SH_Clock_Noise); - } -} - static void initStatic__DrumKit() { Plugin* const p = new Plugin; @@ -2574,7 +2550,6 @@ void initStaticPlugins() initStatic__CatroModulo(); initStatic__cf(); initStatic__ChowDSP(); - initStatic__Dintree(); initStatic__DrumKit(); initStatic__ESeries(); initStatic__ExpertSleepersEncoders();