From 6628d7f69e8353e8b814b8fbaeae3b062ec5cea9 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 13 Feb 2022 22:20:40 +0000 Subject: [PATCH] Remove AnimatedCircuits temporarily until explicit permission Signed-off-by: falkTX --- plugins/AnimatedCircuits | 1 - plugins/Makefile | 3 ++- plugins/plugins.cpp | 25 +++++++------------------ src/custom/dep.cpp | 5 ++++- 4 files changed, 13 insertions(+), 21 deletions(-) delete mode 160000 plugins/AnimatedCircuits diff --git a/plugins/AnimatedCircuits b/plugins/AnimatedCircuits deleted file mode 160000 index bd45fc5..0000000 --- a/plugins/AnimatedCircuits +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bd45fc5e9b472182bcc74da264f865d1424a76be diff --git a/plugins/Makefile b/plugins/Makefile index 54c861d..69d964a 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -240,7 +240,8 @@ AMALGAMATEDHARMONICS_CUSTOM += bogaudio # -------------------------------------------------------------- # AnimatedCircuits -PLUGIN_FILES += $(wildcard AnimatedCircuits/src/Folding/*.cpp) +# PLUGIN_FILES += $(wildcard AnimatedCircuits/src/Folding/*.cpp) +# PLUGIN_FILES += $(wildcard AnimatedCircuits/src/LFold/*.cpp) # -------------------------------------------------------------- # Aria diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 3c2346f..fda9266 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -30,8 +30,10 @@ // AmalgamatedHarmonics #include "AmalgamatedHarmonics/src/AH.hpp" +/* // AnimatedCircuits #include "AnimatedCircuits/src/plugin.hpp" +*/ // Aria /* NOTE too much noise in original include, do this a different way @@ -522,9 +524,8 @@ Plugin* pluginInstance__Cardinal; #ifndef NOPLUGINS Plugin* pluginInstance__21kHz; Plugin* pluginInstance__AmalgamatedHarmonics; -Plugin* pluginInstance__AnimatedCircuits; +// Plugin* pluginInstance__AnimatedCircuits; Plugin* pluginInstance__Aria; -// Plugin* pluginInstance__Atelier; Plugin* pluginInstance__AudibleInstruments; extern Plugin* pluginInstance__Autinn; Plugin* pluginInstance__Bacon; @@ -748,6 +749,7 @@ static void initStatic__AmalgamatedHarmonics() } } +/* static void initStatic__AnimatedCircuits() { Plugin* const p = new Plugin; @@ -757,8 +759,10 @@ static void initStatic__AnimatedCircuits() if (spl.ok()) { p->addModel(model_AC_Folding); + p->addModel(model_AC_LFold); } } +*/ static void initStatic__Aria() { @@ -796,20 +800,6 @@ static void initStatic__Aria() } } -/* -static void initStatic__Atelier() -{ - Plugin* const p = new Plugin; - pluginInstance__Atelier = p; - - const StaticPluginLoader spl(p, "Atelier"); - if (spl.ok()) - { - p->addModel(modelPalette); - } -} -*/ - static void initStatic__AudibleInstruments() { Plugin* const p = new Plugin; @@ -1863,9 +1853,8 @@ void initStaticPlugins() #ifndef NOPLUGINS initStatic__21kHz(); initStatic__AmalgamatedHarmonics(); - initStatic__AnimatedCircuits(); + // initStatic__AnimatedCircuits(); initStatic__Aria(); - // initStatic__Atelier(); initStatic__AudibleInstruments(); initStatic__Autinn(); initStatic__Bacon(); diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp index 7aef5f0..e2749be 100644 --- a/src/custom/dep.cpp +++ b/src/custom/dep.cpp @@ -56,9 +56,12 @@ static const struct { { "/21kHz/res/Panels/D_Inf.svg", {}, -1 }, { "/21kHz/res/Panels/PalmLoop.svg", {}, -1 }, { "/21kHz/res/Panels/TachyonEntangler.svg", {}, -1 }, - // CC-BY-NC-SA-4.0 + // CC-BY-NC-SA-4.0, logo is meant to be removed and name changed on derivative works + /* Pending https://github.com/AnimatedCircuits/RackModules/issues/7 { "/AnimatedCircuits/res/FoldingLight.svg", {}, -1 }, + { "/AnimatedCircuits/res/LFoldLight.svg", {}, -1 }, { "/AnimatedCircuits/res/Knob_Black_Light_21.svg", {}, -1 }, + */ // Custom, runtime dark mode used with permission { "/AudibleInstruments/res/Blinds.svg", {}, -1 }, { "/AudibleInstruments/res/Braids.svg", {}, -1 },