diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aef017e..ba1e33c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: target: [aarch64, armhf, i686, riscv64, x86_64] runs-on: ubuntu-latest container: - image: ubuntu:22.04 + image: ubuntu:20.04 steps: - name: Install git run: | @@ -125,7 +125,7 @@ jobs: *.tar.gz linux-x86_64-debug: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 with: @@ -228,12 +228,10 @@ jobs: files: | ${{ github.event.repository.name }}-*.pkg - mod-plugin-builder: + modaudio: strategy: matrix: include: - - name: darkglass-anagram - target: darkglass-anagram - name: modduo target: modduo-static extraflags: MODDUO=true @@ -241,7 +239,7 @@ jobs: target: modduox-static - name: moddwarf target: moddwarf - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 with: @@ -256,7 +254,7 @@ jobs: - name: Set up dependencies run: | sudo apt-get update -qq - sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python3 libtool-bin liblo-dev qemu-user-static + sudo apt-get install -yqq acl bc curl cvs git mercurial rsync subversion wget bison bzip2 flex gawk gperf gzip help2man nano perl patch tar texinfo unzip automake binutils build-essential cpio libtool libncurses-dev pkg-config python libtool-bin liblo-dev qemu-user-static sudo apt-get install -yqq pandoc texlive-latex-recommended texlive-latex-extra sudo apt-get clean - name: Bootstrap toolchain @@ -473,7 +471,7 @@ jobs: Cardinal-*.zip headless: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 with: @@ -490,7 +488,7 @@ jobs: make HEADLESS=true -j $(nproc) lto: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 with: @@ -507,7 +505,7 @@ jobs: make WITH_LTO=true -j $(nproc) native sysdeps: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 with: @@ -523,7 +521,7 @@ jobs: make SYSDEPS=true -j $(nproc) source-tarball: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 with: @@ -563,7 +561,7 @@ jobs: /home/runner/*/*/cardinal*.tar.xz plugin-validation: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v4 with: @@ -585,8 +583,8 @@ jobs: - name: Set up dependencies run: | # custom repos - wget https://launchpad.net/~kxstudio-debian/+archive/kxstudio/+files/kxstudio-repos_11.2.0_all.deb - sudo dpkg -i kxstudio-repos_11.2.0_all.deb + wget https://launchpad.net/~kxstudio-debian/+archive/kxstudio/+files/kxstudio-repos_11.1.0_all.deb + sudo dpkg -i kxstudio-repos_11.1.0_all.deb sudo apt-get update -qq # build-deps sudo apt-get install -yqq libdbus-1-dev libgl1-mesa-dev liblo-dev libx11-dev libxcursor-dev libxext-dev libxrandr-dev diff --git a/.gitmodules b/.gitmodules index b054833..8460a09 100644 --- a/.gitmodules +++ b/.gitmodules @@ -260,7 +260,4 @@ [submodule "plugins/admiral"] path = plugins/admiral url = https://github.com/wapiflapi/admiral.git -[submodule "plugins/eightfold"] - path = plugins/eightfold - url = https://github.com/scanner-darkly/eightfold.git diff --git a/README.md b/README.md index a216d0e..3de00ba 100644 --- a/README.md +++ b/README.md @@ -146,7 +146,6 @@ At the moment the following 3rd-party modules are provided: - [dBiz](https://github.com/dBiz/dBiz) - [DHE Modules](https://github.com/dhemery/DHE-Modules) - [DrumKit](https://svmodular.com/plugin/vcv/drumkit.html) -- [eightfold](https://github.com/scanner-darkly/eightfold) - [EnigmaCurry](https://github.com/EnigmaCurry/EnigmaCurry-vcv-pack) - [E-Series](https://github.com/VCVRack/ESeries) - [ExpertSleepers Encoders](https://expert-sleepers.co.uk/vcvrack_encoders.html) diff --git a/deps/Makefile b/deps/Makefile index c53e998..0354e0c 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -57,7 +57,6 @@ SPACE += CMAKE = cmake CMAKE += -DCMAKE_INSTALL_LIBDIR=lib CMAKE += -DCMAKE_INSTALL_PREFIX='$(RACK_DEP_PATH)' -CMAKE += -DCMAKE_POLICY_VERSION_MINIMUM=3.5 CMAKE += -DBUILD_SHARED_LIBS=OFF # make sure debug/release matches diff --git a/deps/PawPaw b/deps/PawPaw index 0946f78..0985cf8 160000 --- a/deps/PawPaw +++ b/deps/PawPaw @@ -1 +1 @@ -Subproject commit 0946f783f0e9e230bca893289325f91144a3429f +Subproject commit 0985cf8d1c3a00b1958ef90e0f1aa511b865241a diff --git a/docs/LICENSES.md b/docs/LICENSES.md index 671f0e3..7e17118 100644 --- a/docs/LICENSES.md +++ b/docs/LICENSES.md @@ -40,7 +40,6 @@ Below follows a list of all code licenses used in Cardinal and linked submodules | dBiz | GPL-3.0-or-later | | | DHE-Modules | MIT | | | DrumKit | CC0-1.0 | | -| eightfold | GPL-3.0-or-later | | | EnigmaCurry | GPL-3.0-or-later | | | E-Series | GPL-3.0-or-later | | | ExpertSleepers Encoders | MIT | | @@ -179,7 +178,6 @@ Below is a list of artwork licenses from plugins | DHE-Modules/* | MIT | Same license as source code | | DrumKit/* | CC0-1.0 | | | DrumKit/component/NovaMono.ttf | OFL-1.1-RFN | | -| eightfold/* | GPL-3.0-or-later | No artwork specific license provided | | EnigmaCurry/res/fonts/dseg/* | OFL-1.1-RFN | | | EnigmaCurry/res/fonts/Fantasque/* | OFL-1.1 | | | EnigmaCurry/res/fonts/manrope/* | OFL-1.1 | | @@ -203,7 +201,6 @@ Below is a list of artwork licenses from plugins | ImpromptuModular/res/comp/complib/* | CC-BY-NC-4.0 | | | JW-Modules/* | BSD-3-Clause | No artwork specific license provided | | JW-Modules/DejaVuSansMono.ttf | Bitstream-Vera | Unused in Cardinal | -| JW-Modules/res/fonts/ShareTechMono-Regular.ttf | OFL-1.1 | | | kocmoc/* | GPL-3.0-or-later | No artwork specific license provided | | LifeFormModular/* | MIT | No artwork specific license provided | | LilacLoop/* | GPL-3.0-or-later | No artwork specific license provided | diff --git a/dpf b/dpf index f3be5ae..32d911c 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit f3be5aee081d87cc7a6795110525569670ff0907 +Subproject commit 32d911c1decd721520e44adce2ca7a92ca0ec4f0 diff --git a/include/plugincontext.hpp b/include/plugincontext.hpp index bda0263..5daa32c 100644 --- a/include/plugincontext.hpp +++ b/include/plugincontext.hpp @@ -68,7 +68,7 @@ using CardinalDGL::IdleCallback; // -------------------------------------------------------------------------------------------------------------------- // Cardinal specific context -static constexpr const uint32_t kModuleParameterCount = 24; +static constexpr const uint32_t kModuleParameterCount = 512; enum CardinalVariant { kCardinalVariantMain, diff --git a/plugins/AmalgamatedHarmonics b/plugins/AmalgamatedHarmonics index bf74c2b..97700c0 160000 --- a/plugins/AmalgamatedHarmonics +++ b/plugins/AmalgamatedHarmonics @@ -1 +1 @@ -Subproject commit bf74c2b7674c610cfc57421157d814c98bd92438 +Subproject commit 97700c06af7df4d8fcf173ae3670b7907a682627 diff --git a/plugins/Befaco b/plugins/Befaco index 5914634..5a80023 160000 --- a/plugins/Befaco +++ b/plugins/Befaco @@ -1 +1 @@ -Subproject commit 5914634cd91cf11cc32394616252beb19c5c934c +Subproject commit 5a80023d86e0f67ead3e27385170310cd430d44c diff --git a/plugins/Cardinal/src/HostParameters.cpp b/plugins/Cardinal/src/HostParameters.cpp index 1cbb37f..18063a6 100644 --- a/plugins/Cardinal/src/HostParameters.cpp +++ b/plugins/Cardinal/src/HostParameters.cpp @@ -30,17 +30,18 @@ struct HostParameters : TerminalModule { NUM_INPUTS }; enum OutputIds { - NUM_OUTPUTS = kModuleParameterCount + NUM_OUTPUTS = 32 }; enum LightIds { NUM_LIGHTS }; CardinalPluginContext* const pcontext; - rack::dsp::SlewLimiter parameters[kModuleParameterCount]; - bool parametersConnected[kModuleParameterCount] = {}; + rack::dsp::SlewLimiter parameters[32]; + bool parametersConnected[32] = {}; bool bypassed = false; bool smooth = true; + uint8_t bank = 0; uint32_t lastProcessCounter = 0; HostParameters() @@ -61,7 +62,7 @@ struct HostParameters : TerminalModule { bypassed = isBypassed(); lastProcessCounter = processCounter; - for (uint32_t i=0; iparameters[i]) - : pcontext->parameters[i]); + outputs[i].setVoltage(smooth ? parameters[i].process(args.sampleTime, pcontext->parameters[i+32*bank]) + : pcontext->parameters[i+32*bank]); } } @@ -91,7 +92,7 @@ struct HostParameters : TerminalModule { { const double fall = 1.0 / (double(pcontext->bufferSize) / e.sampleRate); - for (uint32_t i=0; i(APP)) - handleHostParameterDrag(pcontext, portId, true); + handleHostParameterDrag(pcontext, ((HostParameters*)module)->bank*portId, true); PJ301MPort::onDragStart(e); } void onDragEnd(const DragEndEvent& e) override { if (const CardinalPluginContext* const pcontext = static_cast(APP)) - handleHostParameterDrag(pcontext, portId, false); + handleHostParameterDrag(pcontext, ((HostParameters*)module)->bank*portId, false); PJ301MPort::onDragEnd(e); } }; @@ -138,7 +142,7 @@ struct HostParametersWidget : ModuleWidgetWith9HP { static constexpr const float startX = 10.0f; static constexpr const float startY = 90.0f; static constexpr const float paddingH = 30.0f; - static constexpr const float paddingV = 49.0f; + static constexpr const float paddingV = 36.0f; HostParameters* const module; @@ -149,10 +153,10 @@ struct HostParametersWidget : ModuleWidgetWith9HP { setPanel(APP->window->loadSvg(asset::plugin(pluginInstance, "res/HostParameters.svg"))); createAndAddScrews(); - for (int i=0; i<24; ++i) + for (int i=0; i<32; ++i) { - const float x = startX + int(i / 6) * paddingH; - const float y = startY + int(i % 6) * paddingV; + const float x = startX + int(i % 4) * paddingH; + const float y = startY + int(i / 4) * paddingV; addOutput(createOutput(Vec(x, y), m, i)); } } @@ -162,22 +166,28 @@ struct HostParametersWidget : ModuleWidgetWith9HP { drawBackground(args.vg); nvgFontFaceId(args.vg, 0); - nvgFontSize(args.vg, 14); + nvgFontSize(args.vg, 10); - char text[] = { '0', '0', '\0' }; - for (int i=0; i<24; ++i) + char text[] = { '0', '0', '0', '\0'}; + snprintf(text, 4, "%03d", 32*(module == nullptr ? 0 : module->bank)); + for (int i=0; i<32; ++i) { - const float x = startX + int(i / 6) * paddingH; - const float y = startY + int(i % 6) * paddingV; + const float x = startX + int(i % 4) * paddingH; + const float y = startY + int(i / 4) * paddingV; nvgBeginPath(args.vg); nvgRoundedRect(args.vg, x - 1.0f, y - 19.0f, paddingH - 4.0f, paddingV - 4.0f, 4); nvgFillColor(args.vg, nvgRGB(0xd0, 0xd0, 0xd0)); nvgFill(args.vg); - if (text[1]++ == '9') + + if (text[2]++ == '9') { - text[1] = '0'; - ++text[0]; + text[2] = '0'; + if (text[1]++ == '9') + { + text[1] = '0'; + ++text[0]; + } } nvgBeginPath(args.vg); nvgFillColor(args.vg, color::BLACK); @@ -191,6 +201,15 @@ struct HostParametersWidget : ModuleWidgetWith9HP { { menu->addChild(new MenuSeparator); menu->addChild(createBoolPtrMenuItem("Smooth", "", &module->smooth)); + menu->addChild(createSubmenuItem("Bank", string::f("%d", module->bank), [=](Menu* menu) { + for (int c = 0; c < 16; c++) { + menu->addChild(createCheckMenuItem(string::f("%d", c+1), "", + [=]() {return module->bank == c;}, + [=]() {module->bank = c;} + )); + } + })); + } }; #else diff --git a/plugins/HetrickCV b/plugins/HetrickCV index 52b1e03..4dc7c53 160000 --- a/plugins/HetrickCV +++ b/plugins/HetrickCV @@ -1 +1 @@ -Subproject commit 52b1e03c34bd1baa264395c150cd62d8e192b12f +Subproject commit 4dc7c53b9f230bfd4f6c4deb432c477a65188ac0 diff --git a/plugins/JW-Modules b/plugins/JW-Modules index 72c8b56..9d8f851 160000 --- a/plugins/JW-Modules +++ b/plugins/JW-Modules @@ -1 +1 @@ -Subproject commit 72c8b569dd2cc12ce16abe2da582fc58e07c3d54 +Subproject commit 9d8f8515deb20d7e14ca85b4c1d04ec6b66b3e8d diff --git a/plugins/LyraeModules b/plugins/LyraeModules index b6dde88..8162f0d 160000 --- a/plugins/LyraeModules +++ b/plugins/LyraeModules @@ -1 +1 @@ -Subproject commit b6dde88e4d780de0207ece26c5b7de23d61c84e6 +Subproject commit 8162f0d6aee157425c7d7eb3582d905c9ac6c43e diff --git a/plugins/Makefile b/plugins/Makefile index b975411..58bd300 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -560,7 +560,7 @@ PLUGIN_FILES += $(filter-out Befaco/src/plugin.cpp Befaco/src/MidiThing.cpp,$(wi PLUGIN_FILES += $(wildcard Befaco/src/noise-plethora/*/*.cpp) # modules/types which are present in other plugins -BEFACO_CUSTOM = ADSR Mixer chowdsp Burst RecordButton Mixer2 Slew +BEFACO_CUSTOM = ADSR Mixer chowdsp Burst RecordButton BEFACO_FLAGS = $(filter-out -fsingle-precision-constant,$(filter-out -std=gnu++11,$(BUILD_CXX_FLAGS))) BEFACO_FLAGS += -std=gnu++17 @@ -707,17 +707,6 @@ PLUGIN_FILES += $(wildcard DrumKit/deps/SynthDevKit/src/*.cpp) # modules/types which are present in other plugins DRUMKIT_CUSTOM = ADSR Envelope LowFrequencyOscillator -# -------------------------------------------------------------- -# eightfold - -PLUGIN_FILES += $(filter-out eightfold/src/plugin.cpp,$(wildcard eightfold/src/*.cpp)) -# modules/types which are present in other plugins -EIGHTFOLD_CUSTOM = Comparator comparator - - -EIGHTFOLD_FLAGS = $(filter-out -std=gnu++11,$(BUILD_CXX_FLAGS)) -EIGHTFOLD_FLAGS += -std=gnu++17 - # -------------------------------------------------------------- # EnigmaCurry @@ -835,7 +824,7 @@ endif endif # modules/types which are present in other plugins -JW_CUSTOM = PlayHead Quantizer Arrange +JW_CUSTOM = PlayHead Quantizer # -------------------------------------------------------------- # kocmoc @@ -1457,7 +1446,6 @@ clean: PLUGIN_LIST = $(subst /plugin.json,,$(wildcard */plugin.json)) UNWANTED_FILES = HetrickCV/res/illustrator - deprecated/MyModule.svg -UNWANTED_FILES += $(wildcard "HetrickCV/res/affinity redo/*") UNWANTED_FILES += $(wildcard Meander/res/*) UNWANTED_FILES += $(wildcard Mog/res/*) UNWANTED_FILES += $(wildcard Mog/res/*/*) @@ -2359,13 +2347,6 @@ $(BUILD_DIR)/DrumKit/%.cpp.o: DrumKit/%.cpp -Dinit=init__DrumKit \ -Wno-sign-compare -$(BUILD_DIR)/eightfold/src/%.cpp.o: eightfold/src/%.cpp - -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" - @echo "Compiling $<" - $(SILENT)$(CXX) $< $(EIGHTFOLD_FLAGS) -c -o $@ \ - $(foreach m,$(EIGHTFOLD_CUSTOM),$(call custom_module_names,$(m),eightfold)) \ - -DpluginInstance=pluginInstance__eightfold - $(BUILD_DIR)/EnigmaCurry/src/%.cpp.o: EnigmaCurry/src/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" @@ -2763,7 +2744,6 @@ $(BUILD_DIR)/Sapphire/%.cpp.o: Sapphire/%.cpp @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -std=gnu++17 -c -o $@ \ $(foreach m,$(SAPPHIRE_CUSTOM),$(call custom_module_names,$(m),Sapphire)) \ - -DSKIP_MINGW_FORMAT \ -DpluginInstance=pluginInstance__sapphire $(BUILD_DIR)/sonusmodular/%.cpp.o: sonusmodular/%.cpp diff --git a/plugins/MockbaModular b/plugins/MockbaModular index b819787..479d2c8 160000 --- a/plugins/MockbaModular +++ b/plugins/MockbaModular @@ -1 +1 @@ -Subproject commit b819787d86a1db0ad6f4208cb96b8e3589b5e4ee +Subproject commit 479d2c8007b2087cdf557a491df25c5b85784a96 diff --git a/plugins/PathSet b/plugins/PathSet index 2f55b4b..66e69a2 160000 --- a/plugins/PathSet +++ b/plugins/PathSet @@ -1 +1 @@ -Subproject commit 2f55b4b115e76623ef54e24c30daad4d576a4446 +Subproject commit 66e69a2f2047e3dab06275b12852e56d143388cf diff --git a/plugins/Sapphire b/plugins/Sapphire index a1f7deb..fcfdfab 160000 --- a/plugins/Sapphire +++ b/plugins/Sapphire @@ -1 +1 @@ -Subproject commit a1f7deb7931b7ef0fc4fa9f8a3871d9e37e81e73 +Subproject commit fcfdfab93efed535ea65e0a47c870f6e2e6654be diff --git a/plugins/ZZC b/plugins/ZZC index f590088..1536461 160000 --- a/plugins/ZZC +++ b/plugins/ZZC @@ -1 +1 @@ -Subproject commit f5900888025fcfad7842770e83365ba743bb51bd +Subproject commit 15364616da500d31f7545dcbfc01b4fda7f7c9d4 diff --git a/plugins/eightfold b/plugins/eightfold deleted file mode 160000 index a541c5c..0000000 --- a/plugins/eightfold +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a541c5cfdc3fb9ad8e4f345470f817eaf576b987 diff --git a/plugins/kocmoc b/plugins/kocmoc index eaf7cbf..eb46ce3 160000 --- a/plugins/kocmoc +++ b/plugins/kocmoc @@ -1 +1 @@ -Subproject commit eaf7cbf3af0a8525d3c649c53eab476c3052d41b +Subproject commit eb46ce3a8b5795d61c2e3eb60f6ca58799a8cee2 diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 45c0f52..b7a7b42 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -147,14 +147,10 @@ extern Model* modelChord; #define modelADSR modelBefacoADSR #define modelMixer modelBefacoMixer #define modelBurst modelBefacoBurst -#define modelMixer2 modelBefacoMixer2 -#define modelSlew modelBefacoSlew #include "Befaco/src/plugin.hpp" #undef modelADSR #undef modelMixer #undef modelBurst -#undef modelMixer2 -#undef modelSlew // Bidoo #include "Bidoo/src/plugin.hpp" @@ -399,9 +395,6 @@ namespace xycloid { void init(Plugin*); } #include "DrumKit/src/DrumKit.hpp" void setupSamples(); -// eightfold -#include "eightfold/src/plugin.hpp" - // EnigmaCurry #define modelPulse modelEnigmaCurryPulse #include "EnigmaCurry/src/plugin.hpp" @@ -457,7 +450,6 @@ void saveGtgPluginDefault(const char*, int) {} extern Model* modelTwoToFour; extern Model* modelAnalogToDigital; extern Model* modelASR; -extern Model* modelBinaryCounter; extern Model* modelBinaryGate; extern Model* modelBinaryNoise; extern Model* modelBitshift; @@ -492,7 +484,6 @@ extern Model* modelPhasorAnalyzer; extern Model* modelPhasorBurstGen; extern Model* modelPhasorDivMult; extern Model* modelPhasorEuclidean; -extern Model* modelPhasorFreezer; extern Model* modelPhasorGates; extern Model* modelPhasorGates32; extern Model* modelPhasorGates64; @@ -501,7 +492,6 @@ extern Model* modelPhasorGeometry; extern Model* modelPhasorHumanizer; extern Model* modelPhasorMixer; extern Model* modelPhasorOctature; -extern Model* modelPhasorProbability; extern Model* modelPhasorQuadrature; extern Model* modelPhasorRandom; extern Model* modelPhasorRanger; @@ -509,7 +499,6 @@ extern Model* modelPhasorReset; extern Model* modelPhasorRhythmGroup; extern Model* modelPhasorShape; extern Model* modelPhasorShift; -extern Model* modelPhasorSplitter; extern Model* modelPhasorStutter; extern Model* modelPhasorSubstepShape; extern Model* modelPhasorSwing; @@ -522,7 +511,6 @@ extern Model* modelRandomGates; extern Model* modelRotator; extern Model* modelRungler; extern Model* modelScanner; -extern Model* modelTrigShaper; extern Model* modelVectorMix; extern Model* modelWaveshape; extern Model* modelXYToPolar; @@ -574,10 +562,8 @@ extern Model* modelBlankPanel; // JW-Modules #define modelQuantizer modelJWQuantizer -#define modelArrange modelJWArrange #include "JW-Modules/src/JWModules.hpp" #undef modelQuantizer -#undef modelArrange // kocmoc #include "kocmoc/src/plugin.hpp" @@ -625,8 +611,6 @@ extern Model* modelDelta; extern Model* modelVega; extern Model* modelBD383238; extern Model* modelZeta; -extern Model* modelSheliak; -extern Model* modelBeta; #undef modelDelta // Meander @@ -958,7 +942,6 @@ Plugin* pluginInstance__CVfunk; Plugin* pluginInstance__dBiz; Plugin* pluginInstance__DHE; extern Plugin* pluginInstance__DrumKit; -Plugin* pluginInstance__eightfold; Plugin* pluginInstance__EnigmaCurry; Plugin* pluginInstance__ESeries; Plugin* pluginInstance__ExpertSleepersEncoders; @@ -1625,8 +1608,6 @@ static void initStatic__Befaco() #define modelADSR modelBefacoADSR #define modelMixer modelBefacoMixer #define modelBurst modelBefacoBurst -#define modelMixer2 modelBefacoMixer2 -#define modelSlew modelBefacoSlew p->addModel(modelEvenVCO); p->addModel(modelRampage); p->addModel(modelABC); @@ -1653,16 +1634,9 @@ static void initStatic__Befaco() p->addModel(modelOctaves); p->addModel(modelBypass); p->addModel(modelBandit); - p->addModel(modelAtte); - p->addModel(modelAxBC); - p->addModel(modelMixer2); - p->addModel(modelMuDi); - p->addModel(modelSlew); #undef modelADSR #undef modelMixer #undef modelBurst -#undef modelMixer2 -#undef modelSlew // NOTE disabled in Cardinal due to MIDI usage spl.removeModule("MidiThingV2"); @@ -2064,7 +2038,7 @@ static void initStatic__CVfunk() p->addModel(modelStepWave); p->addModel(modelPreeeeeeeeeeessedDuck); p->addModel(modelArrange); - p->addModel(modelTriDelay); + p->addModel(modelTriDelay); #undef modelSteps } } @@ -2171,22 +2145,6 @@ static void initStatic__DrumKit() } } -static void initStatic__eightfold() -{ - Plugin* const p = new Plugin; - pluginInstance__eightfold = p; - - const StaticPluginLoader spl(p, "eightfold"); - if (spl.ok()) - { - p->addModel(modelSDOrcasHeartV2); - p->addModel(modelSDFormation); - p->addModel(modelSDLines); - p->addModel(modelSDTransgate); - p->addModel(modelSDComparator); - } -} - static void initStatic__EnigmaCurry() { Plugin* const p = new Plugin; @@ -2419,7 +2377,6 @@ static void initStatic__HetrickCV() p->addModel(modelTwoToFour); p->addModel(modelAnalogToDigital); p->addModel(modelASR); - p->addModel(modelBinaryCounter); p->addModel(modelBinaryGate); p->addModel(modelBinaryNoise); p->addModel(modelBitshift); @@ -2454,7 +2411,6 @@ static void initStatic__HetrickCV() p->addModel(modelPhasorBurstGen); p->addModel(modelPhasorDivMult); p->addModel(modelPhasorEuclidean); - p->addModel(modelPhasorFreezer); p->addModel(modelPhasorGates); p->addModel(modelPhasorGates32); p->addModel(modelPhasorGates64); @@ -2463,7 +2419,6 @@ static void initStatic__HetrickCV() p->addModel(modelPhasorHumanizer); p->addModel(modelPhasorMixer); p->addModel(modelPhasorOctature); - p->addModel(modelPhasorProbability); p->addModel(modelPhasorQuadrature); p->addModel(modelPhasorRandom); p->addModel(modelPhasorRanger); @@ -2471,7 +2426,6 @@ static void initStatic__HetrickCV() p->addModel(modelPhasorRhythmGroup); p->addModel(modelPhasorShape); p->addModel(modelPhasorShift); - p->addModel(modelPhasorSplitter); p->addModel(modelPhasorStutter); p->addModel(modelPhasorSubstepShape); p->addModel(modelPhasorSwing); @@ -2484,7 +2438,6 @@ static void initStatic__HetrickCV() p->addModel(modelRotator); p->addModel(modelRungler); p->addModel(modelScanner); - p->addModel(modelTrigShaper); p->addModel(modelVectorMix); p->addModel(modelWaveshape); p->addModel(modelXYToPolar); @@ -2563,7 +2516,6 @@ static void initStatic__JW() if (spl.ok()) { #define modelQuantizer modelJWQuantizer -#define modelArrange modelJWArrange p->addModel(modelAdd5); p->addModel(modelAbcdSeq); p->addModel(modelBouncyBalls); @@ -2599,9 +2551,7 @@ static void initStatic__JW() #else spl.removeModule("Str1ker"); #endif - p->addModel(modelArrange); #undef modelQuantizer -#undef modelArrange } } @@ -2614,10 +2564,8 @@ static void initStatic__kocmoc() if (spl.ok()) { p->addModel(modelSVF_1); - p->addModel(modeluSVF); p->addModel(modelTRG); p->addModel(modelLADR); - p->addModel(modeluLADR); p->addModel(modelOP); p->addModel(modelPHASR); p->addModel(modelMUL); @@ -2707,8 +2655,6 @@ static void initStatic__Lyrae() p->addModel(modelVega); p->addModel(modelBD383238); p->addModel(modelZeta); - p->addModel(modelSheliak); - p->addModel(modelBeta); #undef modelDelta } } @@ -3213,11 +3159,7 @@ static void initStatic__Sapphire() if (spl.ok()) { p->addModel(modelSapphireChaops); - p->addModel(modelSapphireEcho); - p->addModel(modelSapphireEchoOut); - p->addModel(modelSapphireEchoTap); p->addModel(modelSapphireElastika); - p->addModel(modelSapphireEnv); p->addModel(modelSapphireFrolic); p->addModel(modelSapphireGalaxy); p->addModel(modelSapphireGlee); @@ -3610,7 +3552,6 @@ void initStaticPlugins() initStatic__dBiz(); initStatic__DHE(); initStatic__DrumKit(); - initStatic__eightfold(); initStatic__EnigmaCurry(); initStatic__ESeries(); initStatic__ExpertSleepersEncoders(); diff --git a/src/custom/dep.cpp b/src/custom/dep.cpp index 12feb52..72b76f4 100644 --- a/src/custom/dep.cpp +++ b/src/custom/dep.cpp @@ -285,13 +285,11 @@ static const struct { // GPL-3.0-or-later { kModeKocmoc, "/kocmoc/res/DDLY.svg", {}, -1 }, { kModeKocmoc, "/kocmoc/res/LADR.svg", {}, -1 }, - { kModeKocmoc, "/kocmoc/res/uLADR.svg", {}, -1 }, { kModeKocmoc, "/kocmoc/res/MUL.svg", {}, -1 }, { kModeKocmoc, "/kocmoc/res/OP.svg", {}, -1 }, { kModeKocmoc, "/kocmoc/res/PHASR.svg", {}, -1 }, { kModeKocmoc, "/kocmoc/res/SKF.svg", {}, -1 }, { kModeKocmoc, "/kocmoc/res/SVF.svg", {}, -1 }, - { kModeKocmoc, "/kocmoc/res/uSVF.svg", {}, -1 }, { kModeKocmoc, "/kocmoc/res/TRG.svg", {}, -1 }, // GPL-3.0-or-later { kModeMyth, "/myth-modules/res/Mavka.svg", {}, -1 }, @@ -435,11 +433,6 @@ static const struct { { kModeBefaco, "/Befaco/res/panels/Octaves.svg" }, { kModeBefaco, "/Befaco/res/panels/Bypass.svg" }, { kModeBefaco, "/Befaco/res/panels/Bandit.svg" }, - { kModeBefaco, "/Befaco/res/panels/Atte.svg" }, - { kModeBefaco, "/Befaco/res/panels/AxBC.svg" }, - { kModeBefaco, "/Befaco/res/panels/Mixer2.svg" }, - { kModeBefaco, "/Befaco/res/panels/MuDi.svg" }, - { kModeBefaco, "/Befaco/res/panels/Slew.svg" }, // GPLv3+ { kModeCardinal, "/Cardinal/res/AudioFile.svg" }, { kModeCardinal, "/Cardinal/res/AudioToCVPitch.svg" },