diff --git a/.gitmodules b/.gitmodules index 01152bc..09a2a27 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,9 +43,6 @@ [submodule "plugins/rackwindows"] path = plugins/rackwindows url = https://github.com/CardinalModules/rackwindows.git -[submodule "plugins/AS"] - path = plugins/AS - url = https://github.com/AScustomWorks/AS.git [submodule "plugins/ImpromptuModular"] path = plugins/ImpromptuModular url = https://github.com/MarcBoule/ImpromptuModular.git diff --git a/README.md b/README.md index 4c90189..e8cba64 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,6 @@ At the moment the following 3rd-party modules are provided: - ZetaCarinae Potentially coming soon, currently sorting out license situation: -- AS - Atelier - Befaco - Fundamental diff --git a/doc/LICENSES.md b/doc/LICENSES.md index 9a6159e..90c0798 100644 --- a/doc/LICENSES.md +++ b/doc/LICENSES.md @@ -52,7 +52,6 @@ Bellow follows a list of code licenses from potentially coming modules. | Name | License(s) | Pending reason | |-------------------------|-----------------------|----------------| -| AS | MIT | Artwork license issues, does not allow use outside VCVRack | | 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 | @@ -149,9 +148,6 @@ Bellow follows a list of artwork licenses from potentially coming plugins. | Name | License(s) | Additional notes | |-----------------------------------------|------------------|------------------| -| AS/* | Custom | Copyright 2017, derivative works may not use the AS logo or panel graphics including custom component graphics (knobs, switches, screws, caps, etc.). Redistribution rights requested at [AS#60](https://github.com/AScustomWorks/AS/issues/60) | -| AS/saxmono.ttf | Custom | You may download this font, circulate it und use it freely. You may not alter, rename, change copyrights or modify this font in any way. | -| AS/Segment7Standard.ttf | OFL-1.1-RFN | | | Atelier/* | Custom | Copyright © Pyer 2020, 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) | diff --git a/plugins/AS b/plugins/AS deleted file mode 160000 index 771e499..0000000 --- a/plugins/AS +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 771e499a71e57c22760f80c7a787642e71f8c195 diff --git a/plugins/Makefile b/plugins/Makefile index 577515e..ea58eaa 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -245,16 +245,6 @@ PLUGIN_FILES += $(filter-out AriaModules/src/Arcane.cpp AriaModules/src/plugin.c # modules/types which are present in other plugins ARIA_CUSTOM = Blank -# -------------------------------------------------------------- -# AS - -# PLUGIN_FILES += $(filter-out AS/src/AS.cpp,$(wildcard AS/src/*.cpp)) -# PLUGIN_FILES += AS/freeverb/revmodel.cpp -# -# # modules/types which are present in other plugins -# AS_CUSTOM = ADSR LabelDisplayWidget LowFrequencyOscillator VCA YellowRedLight allpass comb revmodel -# AS_CUSTOM_PER_FILE = NumberDisplayWidget - # -------------------------------------------------------------- # Atelier diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 6f1b262..ca999e5 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -60,17 +60,6 @@ extern Model* modelUndular; extern Model* modelBlank; #undef modelBlank -// AS -/* -#define modelADSR modelASADSR -#define modelVCA modelASVCA -#define YellowRedLight ASYellowRedLight -#include "AS/src/AS.hpp" -#undef modelADSR -#undef modelVCA -#undef YellowRedLight -*/ - // Atelier /* #include "Atelier/src/plugin.hpp" @@ -812,74 +801,6 @@ static void initStatic__Aria() } } -/* -static void initStatic__AS() -{ - Plugin* const p = new Plugin; - pluginInstance__AS = p; - - const StaticPluginLoader spl(p, "AS"); - if (spl.ok()) - { -#define modelADSR modelASADSR -#define modelVCA modelASVCA - //OSCILLATORS - p->addModel(modelSineOsc); - p->addModel(modelSawOsc); - - //TOOLS - p->addModel(modelADSR); - p->addModel(modelVCA); - p->addModel(modelQuadVCA); - p->addModel(modelTriLFO); - p->addModel(modelAtNuVrTr); - p->addModel(modelBPMClock); - p->addModel(modelSEQ16); - p->addModel(modelMixer2ch); - p->addModel(modelMixer4ch); - p->addModel(modelMixer8ch); - p->addModel(modelMonoVUmeter); - p->addModel(modelStereoVUmeter); - p->addModel(modelMultiple2_5); - p->addModel(modelMerge2_5); - p->addModel(modelSteps); - p->addModel(modelLaunchGate); - p->addModel(modelKillGate); - p->addModel(modelFlow); - p->addModel(modelSignalDelay); - p->addModel(modelTriggersMKI); - p->addModel(modelTriggersMKII); - p->addModel(modelTriggersMKIII); - p->addModel(modelBPMCalc); - p->addModel(modelBPMCalc2); - p->addModel(modelCv2T); - p->addModel(modelZeroCV2T); - p->addModel(modelReScale); - - //EFFECTS - p->addModel(modelDelayPlusFx); - p->addModel(modelDelayPlusStereoFx); - p->addModel(modelPhaserFx); - p->addModel(modelReverbFx); - p->addModel(modelReverbStereoFx); - p->addModel(modelSuperDriveFx); - p->addModel(modelSuperDriveStereoFx); - p->addModel(modelTremoloFx); - p->addModel(modelTremoloStereoFx); - p->addModel(modelWaveShaper); - p->addModel(modelWaveShaperStereo); - - //BLANK PANELS - p->addModel(modelBlankPanel4); - p->addModel(modelBlankPanel6); - p->addModel(modelBlankPanel8); - p->addModel(modelBlankPanelSpecial); -#undef modelADSR -#undef modelVCA - } -} -*/ - /* static void initStatic__Atelier() { diff --git a/plugins/todo.txt b/plugins/todo.txt index a81d657..2735250 100644 --- a/plugins/todo.txt +++ b/plugins/todo.txt @@ -11,7 +11,7 @@ NYSTHI 58494.0 (not opensource?) ML_modules 55847.0 https://github.com/martin-lueders/ML_modules/ -FrozenWasteland 53690.0 +FrozenWasteland 53690.0 (GPL-3.0-only) https://github.com/almostEric/FrozenWasteland/ ArableInstruments 48756.0 @@ -22,7 +22,7 @@ https://github.com/squinkylabs/SquinkyVCV LindenbergResearch 43959.0 (not opensource?) -Geodesics 42761.0 +Geodesics 42761.0 (GPL-3.0-only) https://github.com/MarcBoule/Geodesics Alikins 41798.0