From 44ab92da904b5188cffb8197ea9d0f178d7d2368 Mon Sep 17 00:00:00 2001 From: falkTX Date: Wed, 2 Feb 2022 12:26:44 +0000 Subject: [PATCH] Add back ihtsyn Signed-off-by: falkTX --- README.md | 2 +- doc/LICENSES.md | 5 ++--- plugins/Makefile | 18 +++++++++--------- plugins/ihtsyn | 2 +- plugins/plugins.cpp | 10 ++-------- 5 files changed, 15 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index e8cba64..eb5cc89 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,7 @@ At the moment the following 3rd-party modules are provided: - Glue the Giant - Grande - HetrickCV +- ihtsyn - Impromptu - JW-Modules - LifeFormModular @@ -126,7 +127,6 @@ Potentially coming soon, currently sorting out license situation: - Atelier - Befaco - Fundamental -- ihtsyn - ZZC Additionally Cardinal provides its own modules for DAW/Host automation, time position and internal plugin hosting. diff --git a/doc/LICENSES.md b/doc/LICENSES.md index 90c0798..af6ec5c 100644 --- a/doc/LICENSES.md +++ b/doc/LICENSES.md @@ -32,6 +32,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | Glue the Giant | GPL-3.0-or-later | | | Grande | GPL-3.0-or-later | | | HetrickCV | CC0-1.0 | | +| ihtsyn | GPL-3.0-or-later | | | Impromptu | GPL-3.0-or-later | | | JW-Modules | BSD-3-Clause | | | LifeFormModular | MIT | | @@ -55,7 +56,6 @@ Bellow follows a list of code licenses from potentially coming modules. | Atelier | GPL-3.0-or-later | Custom artwork license, needs permission request | | Befaco | GPL-3.0-or-later | Custom artwork license, needs permission request | | 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 | ## ARTWORK / PANEL LICENSES @@ -115,6 +115,7 @@ Below is a list of artwork licenses from plugins | GlueTheGiant/fonts/DSEG7-* | OFL-1.1-RFN | | | GrandeModular/* | CC-BY-NC-ND-4.0 | | | HetrickCV/* | CC0-1.0 | No artwork specific license provided | +| ihtsyn/* | GPL-3.0-or-later | [Same license as source code](https://github.com/nysthi/nysthi/issues/379#issuecomment-1027873902) | | ImpromptuModular/* | CC-BY-NC-ND-4.0 | | | ImpromptuModular/res/comp/complib/* | CC-BY-NC-4.0 | | | JW-Modules/* | BSD-3-Clause | No artwork specific license provided | @@ -152,8 +153,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) | | 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) | ### Rack diff --git a/plugins/Makefile b/plugins/Makefile index ea58eaa..b165b88 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -504,15 +504,15 @@ IMPROMPTUMODULAR_CUSTOM_PER_FILE = Clock stepClock # -------------------------------------------------------------- # ihtsyn -# PLUGIN_FILES += $(filter-out ihtsyn/src/plugin.cpp,$(wildcard ihtsyn/src/*.cpp)) -# -# # modules/types which are present in other plugins -# IHTSYN_CUSTOM_PER_FILE = mv_allpass -# IHTSYN_CUSTOM_PER_FILE += mv_staticallpass4tap -# IHTSYN_CUSTOM_PER_FILE += mv_staticdelayline -# IHTSYN_CUSTOM_PER_FILE += mv_staticdelayline4tap -# IHTSYN_CUSTOM_PER_FILE += mv_staticdelayline8tap -# IHTSYN_CUSTOM_PER_FILE += mv_statevariable +PLUGIN_FILES += $(filter-out ihtsyn/src/plugin.cpp,$(wildcard ihtsyn/src/*.cpp)) + +# modules/types which are present in other plugins +IHTSYN_CUSTOM_PER_FILE = mv_allpass +IHTSYN_CUSTOM_PER_FILE += mv_staticallpass4tap +IHTSYN_CUSTOM_PER_FILE += mv_staticdelayline +IHTSYN_CUSTOM_PER_FILE += mv_staticdelayline4tap +IHTSYN_CUSTOM_PER_FILE += mv_staticdelayline8tap +IHTSYN_CUSTOM_PER_FILE += mv_statevariable # -------------------------------------------------------------- # JW-Modules diff --git a/plugins/ihtsyn b/plugins/ihtsyn index 69d0120..b1d5abe 160000 --- a/plugins/ihtsyn +++ b/plugins/ihtsyn @@ -1 +1 @@ -Subproject commit 69d0120212b3b0afdd608f2667f0959ad9aeffb4 +Subproject commit b1d5abe2337d41ac7b1cf5005b9f580e2f8b3230 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index ca999e5..be920c0 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -391,9 +391,7 @@ extern Model* modelWriteSeq64; extern Model* modelBlankPanel; // ihtsyn -/* #include "ihtsyn/src/plugin.hpp" -*/ // JW-Modules #define modelQuantizer modelJWQuantizer @@ -539,7 +537,6 @@ Plugin* pluginInstance__21kHz; Plugin* pluginInstance__AmalgamatedHarmonics; Plugin* pluginInstance__AnimatedCircuits; Plugin* pluginInstance__Aria; -// Plugin* pluginInstance__AS; // Plugin* pluginInstance__Atelier; Plugin* pluginInstance__AudibleInstruments; extern Plugin* pluginInstance__Autinn; @@ -561,7 +558,7 @@ Plugin* pluginInstance__GrandeModular; Plugin* pluginInstance__GlueTheGiant; Plugin* pluginInstance__HetrickCV; extern Plugin* pluginInstance__ImpromptuModular; -// Plugin* pluginInstance__ihtsyn; +Plugin* pluginInstance__ihtsyn; Plugin* pluginInstance__JW; Plugin* pluginInstance__LifeFormModular; Plugin* pluginInstance__LittleUtils; @@ -1526,7 +1523,6 @@ static void initStatic__ImpromptuModular() } } -/* static void initStatic__ihtsyn() { Plugin* const p = new Plugin; @@ -1541,7 +1537,6 @@ static void initStatic__ihtsyn() p->addModel(modelMVerb); } } -*/ static void initStatic__JW() { @@ -1908,7 +1903,6 @@ void initStaticPlugins() initStatic__AmalgamatedHarmonics(); initStatic__AnimatedCircuits(); initStatic__Aria(); - // initStatic__AS(); // initStatic__Atelier(); initStatic__AudibleInstruments(); initStatic__Autinn(); @@ -1930,7 +1924,7 @@ void initStaticPlugins() initStatic__GrandeModular(); initStatic__HetrickCV(); initStatic__ImpromptuModular(); - // initStatic__ihtsyn(); + initStatic__ihtsyn(); initStatic__JW(); initStatic__LifeFormModular(); initStatic__LittleUtils();