From 3e8b5a02a0133f12a318c7ba0abfbbe7b8a8e5ac Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 27 Jan 2022 01:16:50 +0000 Subject: [PATCH] Bidoo has granted permission --- README.md | 2 +- doc/LICENSES.md | 6 +++--- plugins/Makefile | 20 ++++++++++---------- plugins/plugins.cpp | 8 ++------ src/custom/dep.cpp | 5 ++--- 5 files changed, 18 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index c3140cc..9a2eb3a 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,7 @@ At the moment the following 3rd-party modules are provided: - Aria Salvatrice - Autinn - Bacon Music +- Bidoo - Bogaudio - cf - ChowDSP @@ -115,7 +116,6 @@ Potentially coming soon, currently sorting out license situation: - Atelier - Audible Instruments - Befaco -- Bidoo - Fundamental - ihtsyn - ZZC diff --git a/doc/LICENSES.md b/doc/LICENSES.md index 8d46aa1..9811c8c 100644 --- a/doc/LICENSES.md +++ b/doc/LICENSES.md @@ -19,6 +19,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | Aria Salvatrice | GPL-3.0-or-later | | | Autinn | GPL-3.0-or-later | | | Bacon Music | GPL-3.0-or-later | | +| Bidoo | GPL-3.0-or-later | | | Bogaudio | GPL-3.0-or-later | | | cf | BSD-3-Clause | | | ChowDSP | GPL-3.0-or-later | | @@ -54,7 +55,6 @@ Bellow follows a list of code licenses from potentially coming modules. | Atelier | GPL-3.0-or-later | Custom artwork license, needs permission request | | Audible Instruments | GPL-3.0-or-later | Custom artwork license, needs permission request, also for dark mode | | Befaco | GPL-3.0-or-later | Custom artwork license, needs permission request | -| Bidoo | GPL-3.0-or-later | CC-ND, needs permission for dark mode | | Fundamental | GPL-3.0-or-later | CC-ND, needs permission for dark mode | | ihtsyn | GPL-3.0-or-later | Project deleted by author | | ZZC | GPL-3.0-or-later | Artwork license terms unclear | @@ -93,6 +93,7 @@ Below is a list of artwork licenses from plugins | BaconPlugs/midi/beeth/* | ??? | Taken from http://www.jsbach.net/ | | BaconPlugs/1f953.svg | CC-BY-4.0 | | | BaconPlugs/Keypunch029.json | OFL-1.1 | | +| Bidoo/* | CC-BY-NC-ND-4.0 | [Special permission granted for runtime dark mode](https://github.com/sebastien-bouffier/Bidoo/issues/191) | | BogaudioModules/* | CC-BY-SA-4.0 | | | BogaudioModules/fonts/audiowide.ttf | OFL-1.1-RFN | | | BogaudioModules/fonts/inconsolata*.ttf | OFL-1.1-no-RFN | | @@ -110,7 +111,6 @@ Below is a list of artwork licenses from plugins | ExpertSleepers-Encoders/* | MIT | | | Extratone/* | GPL-3.0-or-later | | | FehlerFabrik/* | GPL-3.0-or-later | No artwork specific license provided, see [FehlerFabrik#17](https://github.com/RCameron93/FehlerFabrik/issues/17) | -| Fundamental/* | CC-BY-NC-ND-4.0 | | | GlueTheGiant/* | GPL-3.0-or-later | | | GlueTheGiant/fonts/DSEG7-* | OFL-1.1-RFN | | | GrandeModular/* | CC-BY-NC-ND-4.0 | | @@ -155,7 +155,7 @@ Bellow follows a list of artwork licenses from potentially coming plugins. | AudibleInstruments/* | Custom | Copyright © Emilie Gillet, used and distributed with permission (TODO ask for it) | | 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 | | +| Fundamental/* | CC-BY-NC-ND-4.0 | | | 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 596b083..0489989 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -392,16 +392,16 @@ PLUGIN_FILES += $(wildcard BaconPlugs/libs/open303-code/Source/DSPCode/*.cpp) # -------------------------------------------------------------- # Bidoo -# PLUGIN_FILES += $(filter-out Bidoo/src/plugin.cpp Bidoo/src/ANTN.cpp,$(wildcard Bidoo/src/*.cpp)) -# PLUGIN_FILES += $(wildcard Bidoo/src/dep/*.cpp) -# PLUGIN_FILES += $(wildcard Bidoo/src/dep/filters/*.cpp) -# PLUGIN_FILES += $(wildcard Bidoo/src/dep/freeverb/*.cpp) -# PLUGIN_FILES += $(wildcard Bidoo/src/dep/lodepng/*.cpp) -# PLUGIN_FILES += $(filter-out Bidoo/src/dep/resampler/main.cpp,$(wildcard Bidoo/src/dep/resampler/*.cpp)) -# -# # modules/types which are present in other plugins -# BIDOO_CUSTOM = ChannelDisplay LadderFilter $(DRWAV) -# BIDOO_CUSTOM_PER_FILE = channel channel filterType +PLUGIN_FILES += $(filter-out Bidoo/src/plugin.cpp Bidoo/src/ANTN.cpp,$(wildcard Bidoo/src/*.cpp)) +PLUGIN_FILES += $(wildcard Bidoo/src/dep/*.cpp) +PLUGIN_FILES += $(wildcard Bidoo/src/dep/filters/*.cpp) +PLUGIN_FILES += $(wildcard Bidoo/src/dep/freeverb/*.cpp) +PLUGIN_FILES += $(wildcard Bidoo/src/dep/lodepng/*.cpp) +PLUGIN_FILES += $(filter-out Bidoo/src/dep/resampler/main.cpp,$(wildcard Bidoo/src/dep/resampler/*.cpp)) + +# modules/types which are present in other plugins +BIDOO_CUSTOM = ChannelDisplay LadderFilter $(DRWAV) +BIDOO_CUSTOM_PER_FILE = channel channel filterType # -------------------------------------------------------------- # BogaudioModules diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 1b764eb..ec44838 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -131,9 +131,7 @@ extern Model* modelChord; */ // Bidoo -/* #include "Bidoo/src/plugin.hpp" -*/ // BogaudioModules - force dark skin as default #include @@ -560,7 +558,7 @@ Plugin* pluginInstance__Aria; extern Plugin* pluginInstance__Autinn; Plugin* pluginInstance__Bacon; // Plugin* pluginInstance__Befaco; -// Plugin* pluginInstance__Bidoo; +Plugin* pluginInstance__Bidoo; Plugin* pluginInstance__BogaudioModules; Plugin* pluginInstance__cf; Plugin* pluginInstance__ChowDSP; @@ -1058,7 +1056,6 @@ static void initStatic__Befaco() } */ -/* static void initStatic__Bidoo() { Plugin* const p = new Plugin; @@ -1117,7 +1114,6 @@ static void initStatic__Bidoo() spl.removeModule("antN"); } } -*/ static void initStatic__BogaudioModules() { @@ -2021,7 +2017,7 @@ void initStaticPlugins() initStatic__Autinn(); initStatic__Bacon(); // initStatic__Befaco(); - // initStatic__Bidoo(); + initStatic__Bidoo(); initStatic__BogaudioModules(); initStatic__cf(); initStatic__ChowDSP(); diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp index d998d6b..001c0c2 100644 --- a/src/custom/dep.cpp +++ b/src/custom/dep.cpp @@ -303,8 +303,7 @@ static const struct { { "/AudibleInstruments/Veils.svg", {}, -1 }, { "/AudibleInstruments/Warps.svg", {}, -1 }, */ - /* - // CC-BY-NC-ND-4.0, needs permission + // CC-BY-NC-ND-4.0, runtime dark mode used with permission { "/Bidoo/ACNE.svg", {}, -1 }, { "/Bidoo/ANTN.svg", {}, -1 }, { "/Bidoo/BAFIS.svg", {}, -1 }, @@ -350,7 +349,6 @@ static const struct { { "/Bidoo/VOID.svg", {}, -1 }, { "/Bidoo/ZINC.svg", {}, -1 }, { "/Bidoo/ZOUMAI.svg", {}, -1 }, - */ // BSD-3-Clause { "/cf/ALGEBRA.svg", {}, -1 }, { "/cf/BUFFER.svg", {}, -1 }, @@ -391,6 +389,7 @@ static const struct { { "/DrumKit/Sequencer.svg", {}, -1 }, { "/DrumKit/Snare.svg", {}, -1 }, { "/DrumKit/Tomi.svg", {}, -1 }, + // Custom, runtime dark mode used with permission { "/ESeries/E340.svg", {}, -1 }, /* // CC-BY-NC-ND-4.0, needs permission