From 788b45a3746b8e45a063df16741c706a61789714 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 22 Jan 2022 23:27:17 +0000 Subject: [PATCH] Sort out situation with cf plugins Signed-off-by: falkTX --- README.md | 2 +- doc/LICENSES.md | 11 +++++------ plugins/Makefile | 2 +- plugins/cf | 2 +- plugins/plugins.cpp | 8 ++------ src/override/dep.cpp | 4 +--- 6 files changed, 11 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 7004250..2cdd6b2 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,7 @@ At the moment the following 3rd-party modules are provided: - Aria Salvatrice - Bacon Music - Bogaudio +- cf - ChowDSP - DrumKit - E-Series @@ -114,7 +115,6 @@ Potentially coming soon, currently sorting out license situation: - Audible Instruments - Befaco - Bidoo -- cf - Fundamental - ihtsyn - ZZC diff --git a/doc/LICENSES.md b/doc/LICENSES.md index 82d84cb..a2818f9 100644 --- a/doc/LICENSES.md +++ b/doc/LICENSES.md @@ -96,6 +96,10 @@ Below is a list of artwork licenses from plugins | BogaudioModules/fonts/inconsolata*.ttf | OFL-1.1-no-RFN | | | Cardinal/* | CC0-1.0 | | | Cardinal/Miku/Miku.png | CC-BY-NC-3.0 | https://piapro.net/intl/en_for_creators.html | +| cf/* | BSD-3-Clause | No artwork specific license provided | +| cf/DejaVuSansMono.ttf | Bitstream-Vera | | +| cf/Segment7Standard.ttf | OFL-1.1-RFN | | +| cf/VT323-Regular.ttf | OFL-1.1-no-RFN | | | ChowDSP/* | GPL-3.0-or-later | | | ChowDSP/fonts/RobotoCondensed-*.ttf | Apache-2.0 | | | DrumKit/* | CC0-1.0 | | @@ -136,7 +140,7 @@ Below is a list of artwork licenses from plugins | ValleyAudio/din1451alt.ttf | CC-BY-3.0-DE | | | ValleyAudio/DSEG14Classic-*.ttf | OFL-1.1-RFN | | | ValleyAudio/ShareTechMono-*.ttf | OFL-1.1-RFN | | -| ZetaCarinaeModules/* | GPL-3.0-or-later | No artwork specific license provided, see [ZetaCarinaeModules#8](https://github.com/mhampton/ZetaCarinaeModules/issues/8) | +| ZetaCarinaeModules/* | GPL-3.0-or-later | No artwork specific license provided | Bellow follows a list of artwork licenses from potentially coming plugins. @@ -150,11 +154,6 @@ Bellow follows a list of artwork licenses from potentially coming plugins. | Befaco/components/* | CC-BY-NC-4.0 | | | Befaco/panels/* | Custom | Copyright © [Befaco](https://www.befaco.org/), used and distributed with permission (TODO ask for it) | | Bidoo/* | CC-BY-NC-ND-4.0 | | -| cf/* | BSD-3-Clause | No artwork specific license provided (TODO check intentional) | -| cf/ArialBlack.ttf | Custom | https://docs.microsoft.com/en-us/typography/fonts/font-faq | -| cf/DejaVuSansMono.ttf | Bitstream-Vera | | -| cf/LEDCalculator.ttf | Custom | Free for personal use | -| cf/Segment7Standard.ttf | OFL-1.1-RFN | | | ihtsyn/* | GPL-3.0-or-later | No artwork specific license provided, author has deleted this repo | | ihtsyn/LEDCalculator.ttf | Custom | Free for personal use | | ZZC/* | ??? | See [ZZC#89](https://github.com/zezic/ZZC/issues/89) and [ZZC#90](https://github.com/zezic/ZZC/issues/90) | diff --git a/plugins/Makefile b/plugins/Makefile index 743069c..531519b 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -412,7 +412,7 @@ PLUGIN_FILES += $(wildcard ChowDSP/lib/r8lib/*.cpp) # -------------------------------------------------------------- # cf -# PLUGIN_FILES += $(filter-out cf/src/plugin.cpp,$(wildcard cf/src/*.cpp)) +PLUGIN_FILES += $(filter-out cf/src/plugin.cpp,$(wildcard cf/src/*.cpp)) # -------------------------------------------------------------- # DrumKit diff --git a/plugins/cf b/plugins/cf index f4e2376..16470fb 160000 --- a/plugins/cf +++ b/plugins/cf @@ -1 +1 @@ -Subproject commit f4e237653b0f32c0e70c42664d78f4908170c4e8 +Subproject commit 16470fb91bc14a7bb1aa8e646b6461af82f81275 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 64450fe..1413449 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -251,9 +251,7 @@ extern Model* modelTestVCF; #undef modelVCO // cf -/* #include "cf/src/plugin.hpp" -*/ // ChowDSP #include "ChowDSP/src/plugin.hpp" @@ -530,7 +528,7 @@ Plugin* pluginInstance__Bacon; // Plugin* pluginInstance__Befaco; // Plugin* pluginInstance__Bidoo; Plugin* pluginInstance__BogaudioModules; -// Plugin* pluginInstance__cf; +Plugin* pluginInstance__cf; Plugin* pluginInstance__ChowDSP; extern Plugin* pluginInstance__DrumKit; Plugin* pluginInstance__ESeries; @@ -1204,7 +1202,6 @@ static void initStatic__BogaudioModules() } } -/* static void initStatic__cf() { Plugin* const p = new Plugin; @@ -1241,7 +1238,6 @@ static void initStatic__cf() p->addModel(modelDAVE); } } -*/ static void initStatic__ChowDSP() { @@ -1959,7 +1955,7 @@ void initStaticPlugins() // initStatic__Befaco(); // initStatic__Bidoo(); initStatic__BogaudioModules(); - // initStatic__cf(); + initStatic__cf(); initStatic__ChowDSP(); initStatic__DrumKit(); initStatic__ESeries(); diff --git a/src/override/dep.cpp b/src/override/dep.cpp index 4f5b448..d998d6b 100644 --- a/src/override/dep.cpp +++ b/src/override/dep.cpp @@ -351,8 +351,7 @@ static const struct { { "/Bidoo/ZINC.svg", {}, -1 }, { "/Bidoo/ZOUMAI.svg", {}, -1 }, */ - /* - // BSD-3-Clause ?? + // BSD-3-Clause { "/cf/ALGEBRA.svg", {}, -1 }, { "/cf/BUFFER.svg", {}, -1 }, { "/cf/CHOKE.svg", {}, -1 }, @@ -379,7 +378,6 @@ static const struct { { "/cf/SUB.svg", {}, -1 }, { "/cf/trSEQ.svg", {}, -1 }, { "/cf/VARIABLE.svg", {}, -1 }, - */ // CC0-1.0 { "/DrumKit/Baronial.svg", {}, -1 }, { "/DrumKit/BD9.svg", {}, -1 },