From 80eab281c0294af3ffcc6cda11c41a5dfc3ceccb Mon Sep 17 00:00:00 2001 From: dreamer Date: Thu, 24 Feb 2022 20:50:39 +0100 Subject: [PATCH 1/7] adding Starling Via --- .gitmodules | 3 +++ README.md | 1 + docs/LICENSES.md | 6 ++++-- plugins/Makefile | 25 +++++++++++++++++++++++++ plugins/StarlingVia | 1 + plugins/plugins.cpp | 29 +++++++++++++++++++++++++++++ 6 files changed, 63 insertions(+), 2 deletions(-) create mode 160000 plugins/StarlingVia diff --git a/.gitmodules b/.gitmodules index 6ad5006..80cbdaf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -151,3 +151,6 @@ [submodule "plugins/ML_modules"] path = plugins/ML_modules url = https://github.com/martin-lueders/ML_modules.git +[submodule "plugins/StarlingVia"] + path = plugins/StarlingVia + url = https://github.com/starlingcode/Via-for-Rack.git diff --git a/README.md b/README.md index 6cde881..9121da0 100644 --- a/README.md +++ b/README.md @@ -142,6 +142,7 @@ At the moment the following 3rd-party modules are provided: - rackwindows - repelzen - Sonus Modular +- Starling Via - Substation Opensource - Valley - ZetaCarinae diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 3a519c2..ca4e605 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -52,8 +52,9 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | Prism | BSD-3-Clause | | | Rackwindows | MIT | | | repelzen | GPL-3.0-or-later | | -| Substation Opensource | BSD-3-Clause-Attribution | Need to check full compatibility with GPLv3+ | | Sonus Modular | GPL-3.0-or-later | | +| Starling Via | MIT | | +| Substation Opensource | BSD-3-Clause-Attribution | Need to check full compatibility with GPLv3+ | | Valley | GPL-3.0-or-later | | | ZetaCarinae | GPL-3.0-or-later | | | ZZC | GPL-3.0-or-later | | @@ -149,8 +150,9 @@ Below is a list of artwork licenses from plugins | Prism/RobotoCondensed-Regular.ttf | Apache-2.0 | | | Rackwindows/* | MIT | [Same license as source code](https://github.com/n0jo/rackwindows/issues/15) | | repelzen/* | CC-BY-SA-4.0 | | -| substation-opensource/* | BSD-3-Clause-Attribution | No artwork specific license provided | | sonusmodular/* | GPL-3.0-or-later | [Same license as source code](https://gitlab.com/sonusdept/sonusmodular/-/issues/14) | +| StarlingVia/* | MIT | No artwork specific license provided | +| substation-opensource/* | BSD-3-Clause-Attribution | No artwork specific license provided | | ValleyAudio/* | GPL-3.0-or-later | [Same license as source code](https://github.com/ValleyAudio/ValleyRackFree/issues/73) | | ValleyAudio/din1451alt.ttf | CC-BY-3.0-DE | | | ValleyAudio/DSEG14Classic-*.ttf | OFL-1.1-RFN | | diff --git a/plugins/Makefile b/plugins/Makefile index dfd9917..7a7ef80 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -662,6 +662,17 @@ REPELZEN_CUSTOM = Blank Mixer Werner tanh_pade PLUGIN_FILES += $(filter-out sonusmodular/src/sonusmodular,$(wildcard sonusmodular/src/*.cpp)) +# -------------------------------------------------------------- +# Starling Via + +PLUGIN_FILES += $(wildcard StarlingVia/src/*.cpp) +PLUGIN_FILES += $(wildcard StarlingVia/Via/io/src/*.cpp) +PLUGIN_FILES += $(wildcard StarlingVia/Via/ui/src/*.cpp) +PLUGIN_FILES += $(wildcard StarlingVia/Via/modules/*/*.cpp) + +# modules/types which are present in other plugins +STARLINGVIA_CUSTOM = Scanner + # -------------------------------------------------------------- # Substation (Open source release) @@ -1491,6 +1502,20 @@ $(BUILD_DIR)/sonusmodular/%.cpp.o: sonusmodular/%.cpp $(foreach m,$(SONUSMODULAR_CUSTOM),$(call custom_module_names,$(m),sonusmodular)) \ -DpluginInstance=pluginInstance__sonusmodular +$(BUILD_DIR)/StarlingVia/%.cpp.o: StarlingVia/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ + $(foreach m,$(STARLINGVIA_CUSTOM),$(call custom_module_names,$(m),StarlingVia)) \ + -DpluginInstance=pluginInstance__StarlingVia \ + -DBUILD_VIRTUAL \ + -IStarlingVia/dep/starling-dsp \ + -IStarlingVia/Via/modules/inc \ + -IStarlingVia/Via/synthesis/inc \ + -IStarlingVia/Via/io/inc \ + -IStarlingVia/Via/ui/inc \ + -I./dep/starling-dsp + $(BUILD_DIR)/substation-%.cpp.o: substation-%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/StarlingVia b/plugins/StarlingVia new file mode 160000 index 0000000..5bf2841 --- /dev/null +++ b/plugins/StarlingVia @@ -0,0 +1 @@ +Subproject commit 5bf284121a788f364e16acd10c6ac7bbe79097ae diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index a6305ef..923c2bd 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -566,6 +566,11 @@ extern Model* modelMaude_221; // sonusmodular #include "sonusmodular/src/sonusmodular.hpp" +// Starling Via +#define modelScanner modelStarlingViaScanner +#include "StarlingVia/src/starling.hpp" +#undef modelScanner + // substation /* NOTE too much noise in original include, do this a different way // "substation-opensource/src/_plugin.hpp" @@ -659,6 +664,7 @@ Plugin* pluginInstance__Prism; Plugin* pluginInstance__rackwindows; Plugin* pluginInstance__repelzen; Plugin* pluginInstance__sonusmodular; +Plugin* pluginInstance__StarlingVia; Plugin* pluginInstance__substation; Plugin* pluginInstance__ValleyAudio; Plugin* pluginInstance__ZetaCarinaeModules; @@ -2082,6 +2088,28 @@ static void initStatic__sonusmodular() } } +static void initStatic__StarlingVia() +{ + Plugin* const p = new Plugin; + pluginInstance__StarlingVia = p; + + const StaticPluginLoader spl(p, "StarlingVia"); + if (spl.ok()) + { +#define modelScanner modelStarlingViaScanner + p->addModel(modelMeta); + p->addModel(modelGateseq); + p->addModel(modelScanner); + p->addModel(modelSync); + p->addModel(modelAtsr); + p->addModel(modelOsc3); + p->addModel(modelSync3); + p->addModel(modelSync3XL); + p->addModel(modelSync3XLLevels); +#undef modelScanner + } +} + static void initStatic__substation() { Plugin* const p = new Plugin; @@ -2212,6 +2240,7 @@ void initStaticPlugins() initStatic__rackwindows(); initStatic__repelzen(); initStatic__sonusmodular(); + initStatic__StarlingVia(); initStatic__substation(); initStatic__ValleyAudio(); initStatic__ZetaCarinaeModules(); From 4a1e3f8b4046c8ad889c296a78327d5f9d6d776d Mon Sep 17 00:00:00 2001 From: dreamer Date: Mon, 23 Oct 2023 21:43:25 +0200 Subject: [PATCH 2/7] update StarlingVia with async file dialogs; adjust plugins/Makefile --- plugins/Makefile | 3 ++- plugins/StarlingVia | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index 7e9d982..276a608 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -2624,7 +2624,8 @@ $(BUILD_DIR)/StarlingVia/%.cpp.o: StarlingVia/%.cpp -IStarlingVia/Via/synthesis/inc \ -IStarlingVia/Via/io/inc \ -IStarlingVia/Via/ui/inc \ - -I./dep/starling-dsp + -IStarlingVia/src/dep/starling-dsp \ + -IStarlingVia/src/dep/starling-rack-ui $(BUILD_DIR)/stoermelder-packone/%.cpp.o: stoermelder-packone/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" diff --git a/plugins/StarlingVia b/plugins/StarlingVia index 5bf2841..9f60b9f 160000 --- a/plugins/StarlingVia +++ b/plugins/StarlingVia @@ -1 +1 @@ -Subproject commit 5bf284121a788f364e16acd10c6ac7bbe79097ae +Subproject commit 9f60b9fd054569d33f6934a4f967bf0ad9802967 From a8313392cf378f9ba28716921542403c98792a22 Mon Sep 17 00:00:00 2001 From: dreamer Date: Tue, 24 Oct 2023 07:40:18 +0200 Subject: [PATCH 3/7] include plugin binaries --- plugins/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/Makefile b/plugins/Makefile index 276a608..489e6fc 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -998,6 +998,12 @@ PLUGIN_FILES += $(wildcard StarlingVia/src/*.cpp) PLUGIN_FILES += $(wildcard StarlingVia/Via/io/src/*.cpp) PLUGIN_FILES += $(wildcard StarlingVia/Via/ui/src/*.cpp) PLUGIN_FILES += $(wildcard StarlingVia/Via/modules/*/*.cpp) +PLUGIN_BINARIES += StarlingVia/res/original.gateseq +PLUGIN_BINARIES += StarlingVia/res/original.meta +PLUGIN_BINARIES += StarlingVia/res/original.osc3 +PLUGIN_BINARIES += StarlingVia/res/original.scanner +PLUGIN_BINARIES += StarlingVia/res/original.sync +PLUGIN_BINARIES += StarlingVia/res/original.sync3 # modules/types which are present in other plugins STARLINGVIA_CUSTOM = Scanner From d42d1b571dd97e422e0874df98cc361f51391d33 Mon Sep 17 00:00:00 2001 From: dreamer Date: Tue, 24 Oct 2023 07:52:14 +0200 Subject: [PATCH 4/7] custom defines for StarlingVia --- plugins/Makefile | 2 +- plugins/plugins.cpp | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/Makefile b/plugins/Makefile index 489e6fc..4862e5f 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1006,7 +1006,7 @@ PLUGIN_BINARIES += StarlingVia/res/original.sync PLUGIN_BINARIES += StarlingVia/res/original.sync3 # modules/types which are present in other plugins -STARLINGVIA_CUSTOM = Scanner +STARLINGVIA_CUSTOM = Scanner Scale Wavetable # -------------------------------------------------------------- # stocaudio diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 706efd4..ef56536 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -731,8 +731,12 @@ void addThemeMenuItems(Menu*, ModuleTheme*) {} // Starling Via #define modelScanner modelStarlingViaScanner +#define Scale starlingViaScale +#define Wavetable starlingViaWavetable #include "StarlingVia/src/starling.hpp" #undef modelScanner +#undef Scale +#undef Wavetable // stocaudio #include "stocaudio/src/plugin.hpp" @@ -2829,6 +2833,8 @@ static void initStatic__StarlingVia() if (spl.ok()) { #define modelScanner modelStarlingViaScanner +#define Scale starlingViaScale +#define Wavetable starlingViaWavetable p->addModel(modelMeta); p->addModel(modelGateseq); p->addModel(modelScanner); @@ -2839,6 +2845,8 @@ static void initStatic__StarlingVia() p->addModel(modelSync3XL); p->addModel(modelSync3XLLevels); #undef modelScanner +#undef Scale +#undef Wavetable } } From 1cd702b655c7a6c94ede7b5bea9aea98a0bc6b65 Mon Sep 17 00:00:00 2001 From: dreamer Date: Tue, 24 Oct 2023 10:07:50 +0200 Subject: [PATCH 5/7] extern StarlingVia --- plugins/plugins.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index ef56536..13127cd 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -872,7 +872,7 @@ Plugin* pluginInstance__RebelTech; Plugin* pluginInstance__repelzen; Plugin* pluginInstance__sapphire; Plugin* pluginInstance__sonusmodular; -Plugin* pluginInstance__StarlingVia; +extern Plugin* pluginInstance__StarlingVia; Plugin* pluginInstance__stocaudio; extern Plugin* pluginInstance__stoermelder_p1; Plugin* pluginInstance__surgext; From f8729e35953acfa6b4341b03756a3c71c4804584 Mon Sep 17 00:00:00 2001 From: dreamer Date: Sat, 6 Jan 2024 16:01:25 +0100 Subject: [PATCH 6/7] update starlingvia --- plugins/StarlingVia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/StarlingVia b/plugins/StarlingVia index 9f60b9f..42e3c8e 160000 --- a/plugins/StarlingVia +++ b/plugins/StarlingVia @@ -1 +1 @@ -Subproject commit 9f60b9fd054569d33f6934a4f967bf0ad9802967 +Subproject commit 42e3c8e916f0982a346098baf37bbb0431b441d2 From b149c13f4135c53681fca7a47bce5407836ed2de Mon Sep 17 00:00:00 2001 From: dreamer Date: Sun, 31 Mar 2024 14:55:33 +0200 Subject: [PATCH 7/7] use newer StarlingVia commit --- plugins/StarlingVia | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/StarlingVia b/plugins/StarlingVia index 42e3c8e..9533138 160000 --- a/plugins/StarlingVia +++ b/plugins/StarlingVia @@ -1 +1 @@ -Subproject commit 42e3c8e916f0982a346098baf37bbb0431b441d2 +Subproject commit 95331388ad4f82c4737471fefbdc0aeb8039f6ff