diff --git a/README.md b/README.md index 1606cc7..acc8c84 100644 --- a/README.md +++ b/README.md @@ -168,6 +168,7 @@ At the moment the following 3rd-party modules are provided: - repelzen - Sonus Modular - stocaudio +- Stoermelder Pack-One - unless_modules - Valley - Voxglitch diff --git a/docs/LICENSES.md b/docs/LICENSES.md index fda67aa..825879e 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -75,6 +75,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule | RebelTech | GPL-2.0-or-later | | | Sonus Modular | GPL-3.0-or-later | | | stocaudio | GPL-3.0-or-later | | +| Stoermelder Pack-One | GPL-3.0-or-later | | | unless_modules | GPL-3.0-or-later | | | Valley | GPL-3.0-or-later | | | Voxglitch | GPL-3.0-or-later | | @@ -212,6 +213,8 @@ Below is a list of artwork licenses from plugins | RebelTech/* | CC-BY-NC-4.0 | | | sonusmodular/* | GPL-3.0-or-later | [Same license as source code](https://gitlab.com/sonusdept/sonusmodular/-/issues/14) | | stocaudio/* | GPL-3.0-or-later | No artwork specific license provided | +| stoermelder-packone/* | GPL-3.0-or-later | No artwork specific license provided | +| stoermelder-packone/fonts/RedkostComic.otf | OFL-1.1-RFN | | | unless_modules/* | CC-BY-NC-ND-4.0 | | | unless_modules/font/CuteFont-Regular.ttf| OFL-1.1 | | | unless_modules/font/Terminus.ttf | GPL-2.0-or-later | [Starting from v4.32, font license is OFL-1.1](https://files.ax86.net/terminus-ttf/#license) | diff --git a/include/engine/Port.hpp b/include/engine/Port.hpp index 98a3a41..748e71f 100644 --- a/include/engine/Port.hpp +++ b/include/engine/Port.hpp @@ -33,7 +33,7 @@ #include /** NOTE alignas is required in some systems in order to allow SSE usage. */ -#define SIMD_ALIGN alignas(32) +#define SIMD_ALIGN alignas(16) namespace rack { diff --git a/include/simd/Vector.hpp b/include/simd/Vector.hpp index 520bfa0..091af1b 100644 --- a/include/simd/Vector.hpp +++ b/include/simd/Vector.hpp @@ -31,7 +31,7 @@ #include /** NOTE alignas is required in some systems in order to allow SSE usage. */ -#define SIMD_ALIGN alignas(32) +#define SIMD_ALIGN alignas(16) namespace rack { diff --git a/plugins/Makefile b/plugins/Makefile index bf26738..6733175 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -904,10 +904,14 @@ PLUGIN_FILES += $(filter-out stocaudio/src/plugin.cpp,$(wildcard stocaudio/src/* # -------------------------------------------------------------- # stoermelder-packone -STOERMELDER_PACKONE_IGNORED = AudioInterface64 MidiCat MidiKey MidiMon MidiPlug MidiStep Strip StripBay StripPp +# will never work +STOERMELDER_PACKONE_IGNORED = AudioInterface64 -# FIXME -STOERMELDER_PACKONE_IGNORED += Raw +# maybe? +STOERMELDER_PACKONE_IGNORED += MidiCat MidiCatCtx MidiCatMem MidiKey MidiMon MidiPlug MidiStep + +# TODO osdialog replacements +STOERMELDER_PACKONE_IGNORED += Strip StripBay StripPp PLUGIN_FILES += $(filter-out $(STOERMELDER_PACKONE_IGNORED:%=stoermelder-packone/src/%.cpp),$(wildcard stoermelder-packone/src/*.cpp stoermelder-packone/src/mb/*.cpp)) diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index fe3ada9..9e7c506 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -719,13 +719,12 @@ void addThemeMenuItems(Menu*, ModuleTheme*) {} #include "stoermelder-packone/src/plugin.hpp" Model* modelAudioInterface64; Model* modelMidiCat; -Model* modelMidiCatMem; Model* modelMidiCatCtx; +Model* modelMidiCatMem; Model* modelMidiKey; Model* modelMidiMon; Model* modelMidiPlug; Model* modelMidiStep; -Model* modelRaw; Model* modelStrip; Model* modelStripBay4; Model* modelStripPp; @@ -2810,10 +2809,7 @@ static void initStatic__stoermelder_packone() p->addModel(modelDirt); p->addModel(modelMb); p->addModel(modelMe); - - // NOTE disabled in Cardinal due to curl usage - // p->addModel(modelRaw); - spl.removeModule("Raw"); + p->addModel(modelRaw); spl.removeModule("AudioInterface64"); spl.removeModule("MidiCat"); diff --git a/plugins/stoermelder-packone b/plugins/stoermelder-packone index a856850..eb4f150 160000 --- a/plugins/stoermelder-packone +++ b/plugins/stoermelder-packone @@ -1 +1 @@ -Subproject commit a8568502e2fa589d1dee50e32a7cb8311f404090 +Subproject commit eb4f150fa707ed5562d5aaeb2a04cc81b6097c39