From 55c87c2ed8de7c65694e9f19f2ae7703466f0920 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 1 Dec 2022 21:12:37 +0000 Subject: [PATCH] Update MindMeldModular, brings Patch Master Signed-off-by: falkTX --- plugins/Makefile | 1 + plugins/MindMeldModular | 2 +- plugins/plugins.cpp | 46 +++++++++++++++++++++++++++-------------- 3 files changed, 32 insertions(+), 17 deletions(-) diff --git a/plugins/Makefile b/plugins/Makefile index c0d7374..bfd8065 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -766,6 +766,7 @@ PLUGIN_FILES += $(wildcard MindMeldModular/src/*.cpp) PLUGIN_FILES += $(wildcard MindMeldModular/src/comp/*.cpp) PLUGIN_FILES += $(wildcard MindMeldModular/src/EqMaster/*.cpp) PLUGIN_FILES += $(wildcard MindMeldModular/src/MixMaster/*.cpp) +PLUGIN_FILES += $(wildcard MindMeldModular/src/PatchSet/*.cpp) PLUGIN_FILES += $(wildcard MindMeldModular/src/ShapeMaster/*.cpp) PLUGIN_FILES += $(wildcard MindMeldModular/src/Utilities/*.cpp) diff --git a/plugins/MindMeldModular b/plugins/MindMeldModular index 8e413a4..c1af4c2 160000 --- a/plugins/MindMeldModular +++ b/plugins/MindMeldModular @@ -1 +1 @@ -Subproject commit 8e413a445c1c307f356ee96633b7f6f2b4c4749e +Subproject commit c1af4c2b4faf7b50481a2cb71996302a7f03a43e diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 6a9bb5e..3ad486e 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -524,18 +524,25 @@ extern int panelTheme; /* NOTE too much noise in original include, do this a different way // #include "MindMeldModular/src/MindMeldModular.hpp" */ -extern Model* modelMixMasterJr; -extern Model* modelAuxExpanderJr; -extern Model* modelMixMaster; -extern Model* modelAuxExpander; -extern Model* modelMeld; -extern Model* modelUnmeld; -extern Model* modelMSMelder; -extern Model* modelEqMaster; -extern Model* modelEqExpander; -extern Model* modelBassMaster; -extern Model* modelBassMasterJr; -extern Model* modelShapeMaster; +extern Model *modelPatchMaster; +extern Model *modelPatchMasterBlank; +extern Model *modelRouteMasterMono5to1; +extern Model *modelRouteMasterStereo5to1; +extern Model *modelRouteMasterMono1to5; +extern Model *modelRouteMasterStereo1to5; +extern Model *modelMasterChannel; +extern Model *modelMeld; +extern Model *modelUnmeld; +extern Model *modelMSMelder; +extern Model *modelEqMaster; +extern Model *modelEqExpander; +extern Model *modelBassMaster; +extern Model *modelBassMasterJr; +extern Model *modelShapeMaster; +extern Model *modelMixMasterJr; +extern Model *modelAuxExpanderJr; +extern Model *modelMixMaster; +extern Model *modelAuxExpander; // ML_modules /* NOTE too much noise in original include, do this a different way @@ -2316,10 +2323,13 @@ static void initStatic__MindMeld() const StaticPluginLoader spl(p, "MindMeldModular"); if (spl.ok()) { - p->addModel(modelMixMasterJr); - p->addModel(modelAuxExpanderJr); - p->addModel(modelMixMaster); - p->addModel(modelAuxExpander); + p->addModel(modelPatchMaster); + p->addModel(modelPatchMasterBlank); + p->addModel(modelRouteMasterMono5to1); + p->addModel(modelRouteMasterStereo5to1); + p->addModel(modelRouteMasterMono1to5); + p->addModel(modelRouteMasterStereo1to5); + p->addModel(modelMasterChannel); p->addModel(modelMeld); p->addModel(modelUnmeld); p->addModel(modelMSMelder); @@ -2328,6 +2338,10 @@ static void initStatic__MindMeld() p->addModel(modelBassMaster); p->addModel(modelBassMasterJr); p->addModel(modelShapeMaster); + p->addModel(modelMixMasterJr); + p->addModel(modelAuxExpanderJr); + p->addModel(modelMixMaster); + p->addModel(modelAuxExpander); } }