diff --git a/.gitmodules b/.gitmodules index 25ad965..373a11d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -130,9 +130,6 @@ [submodule "plugins/Autinn"] path = plugins/Autinn url = https://github.com/NikolaiVChr/Autinn.git -[submodule "plugins/substation-opensource"] - path = plugins/substation-opensource - url = https://gitlab.com/falktx/substation-opensource.git [submodule "plugins/MockbaModular"] path = plugins/MockbaModular url = https://github.com/MockbaTheBorg/MockbaModular.git diff --git a/README.md b/README.md index 72ac8ad..be8c9d0 100644 --- a/README.md +++ b/README.md @@ -154,7 +154,6 @@ At the moment the following 3rd-party modules are provided: - repelzen - Sonus Modular - stocaudio -- Substation Opensource - Valley - Voxglitch - ZetaCarinae diff --git a/docs/LICENSES.md b/docs/LICENSES.md index bde0c0c..31c969a 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -63,7 +63,6 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | Prism | BSD-3-Clause | | | Rackwindows | MIT | | | repelzen | GPL-3.0-or-later | | -| Substation Opensource | BSD-3-Clause-Attribution | Need to check full compatibility with GPLv3+ | | Sonus Modular | GPL-3.0-or-later | | | stocaudio | GPL-3.0-or-later | | | Valley | GPL-3.0-or-later | | @@ -182,7 +181,6 @@ Below is a list of artwork licenses from plugins | Prism/RobotoCondensed-Regular.ttf | Apache-2.0 | | | Rackwindows/* | MIT | [Same license as source code](https://github.com/n0jo/rackwindows/issues/15) | | repelzen/* | CC-BY-SA-4.0 | | -| substation-opensource/* | BSD-3-Clause-Attribution | No artwork specific license provided | | sonusmodular/* | GPL-3.0-or-later | [Same license as source code](https://gitlab.com/sonusdept/sonusmodular/-/issues/14) | | stocaudio/* | GPL-3.0-or-later | No artwork specific license provided | | ValleyAudio/* | GPL-3.0-or-later | [Same license as source code](https://github.com/ValleyAudio/ValleyRackFree/issues/73) | diff --git a/plugins/Makefile b/plugins/Makefile index 0e7d629..d98f492 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -766,14 +766,6 @@ PLUGIN_FILES += $(filter-out sonusmodular/src/sonusmodular.cpp,$(wildcard sonusm PLUGIN_FILES += $(filter-out stocaudio/src/plugin.cpp,$(wildcard stocaudio/src/*.cpp)) -# -------------------------------------------------------------- -# Substation (Open source release) - -PLUGIN_FILES += $(wildcard substation-opensource/dep/slime4rack/src/slime/*.cpp) -PLUGIN_FILES += $(wildcard substation-opensource/dep/slime4rack/src/slime/**/*.cpp) -PLUGIN_FILES += $(filter-out substation-opensource/src/_plugin.cpp substation-opensource/src/Settings.cpp,$(wildcard substation-opensource/src/*.cpp)) -PLUGIN_FILES += substation-settings/Settings.cpp - # -------------------------------------------------------------- # ValleyAudio @@ -1715,15 +1707,6 @@ $(BUILD_DIR)/stocaudio/%.cpp.o: stocaudio/%.cpp $(foreach m,$(STOCAUDIO_CUSTOM),$(call custom_module_names,$(m),stocaudio)) \ -DpluginInstance=pluginInstance__stocaudio -$(BUILD_DIR)/substation-%.cpp.o: substation-%.cpp - -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" - @echo "Compiling $<" - $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ - $(foreach m,$(SUBSTATION_CUSTOM),$(call custom_module_names,$(m),substation)) \ - -DpluginInstance=pluginInstance__substation \ - -D'PRIVATE=__attribute__((error("Using internal Rack function or symbol")))' \ - -Isubstation-opensource/dep/slime4rack/include - $(BUILD_DIR)/ValleyAudio/%.cpp.o: ValleyAudio/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 1fe6926..b789e26 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -649,26 +649,6 @@ extern Model* modelBlankPanel; // stocaudio #include "stocaudio/src/plugin.hpp" -// substation -/* NOTE too much noise in original include, do this a different way -// "substation-opensource/src/_plugin.hpp" -*/ -namespace slime { -namespace plugin { -namespace substation { -extern Model* modelClock; -extern Model* modelPolySequencer; -extern Model* modelSubOscillator; -extern Model* modelMixer; -extern Model* modelFilter; -extern Model* modelEnvelopes; -extern Model* modelQuantizer; -extern Model* modelVCA; -extern Model* modelBlank4; -extern Model* modelBlank7; -extern Model* modelFilterPlus; -}}} - // ValleyAudio #include "ValleyAudio/src/Valley.hpp" @@ -759,7 +739,6 @@ Plugin* pluginInstance__rackwindows; Plugin* pluginInstance__repelzen; Plugin* pluginInstance__sonusmodular; Plugin* pluginInstance__stocaudio; -Plugin* pluginInstance__substation; Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__Voxglitch; Plugin* pluginInstance__ZetaCarinaeModules; @@ -2412,28 +2391,6 @@ static void initStatic__stocaudio() } } -static void initStatic__substation() -{ - Plugin* const p = new Plugin; - pluginInstance__substation = p; - - const StaticPluginLoader spl(p, "substation-opensource"); - if (spl.ok()) - { - p->addModel(slime::plugin::substation::modelClock); - p->addModel(slime::plugin::substation::modelEnvelopes); - p->addModel(slime::plugin::substation::modelFilter); - p->addModel(slime::plugin::substation::modelMixer); - p->addModel(slime::plugin::substation::modelQuantizer); - p->addModel(slime::plugin::substation::modelPolySequencer); - p->addModel(slime::plugin::substation::modelVCA); - p->addModel(slime::plugin::substation::modelSubOscillator); - p->addModel(slime::plugin::substation::modelBlank4); - p->addModel(slime::plugin::substation::modelBlank7); - p->addModel(slime::plugin::substation::modelFilterPlus); - } -} - static void initStatic__ValleyAudio() { Plugin* const p = new Plugin; @@ -2587,7 +2544,6 @@ void initStaticPlugins() initStatic__repelzen(); initStatic__sonusmodular(); initStatic__stocaudio(); - initStatic__substation(); initStatic__ValleyAudio(); initStatic__Voxglitch(); initStatic__ZetaCarinaeModules(); diff --git a/plugins/substation-opensource b/plugins/substation-opensource deleted file mode 160000 index cbc09d4..0000000 --- a/plugins/substation-opensource +++ /dev/null @@ -1 +0,0 @@ -Subproject commit cbc09d4db02d038493689c192d63b746d453d18f diff --git a/plugins/substation-settings/Settings.cpp b/plugins/substation-settings/Settings.cpp deleted file mode 100644 index 0f16ed1..0000000 --- a/plugins/substation-settings/Settings.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * DISTRHO Cardinal Plugin - * Copyright (C) 2021-2022 Filipe Coelho - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 3 of - * the License, or any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * For a full copy of the GNU General Public License see the LICENSE file. - */ - -#include "../substation-opensource/src/Settings.hpp" - -namespace slime { -namespace plugin { -namespace substation { - -PluginSettings::PluginSettings(void) {} -PluginSettings::~PluginSettings(void) {} -void PluginSettings::save() {} -void PluginSettings::load() {} -void PluginSettings::appendContextMenu(rack::ui::Menu* menu) {} -void PluginSettings::updateCableColors(const bool& value) {} - -PluginSettings settings; - -} // namespace substation -} // namespace plugin -} // namespace slime