Browse Source

Add MindMeld modules

Closes #29
tags/22.02
falkTX 4 years ago
parent
commit
1dce589c13
4 changed files with 73 additions and 0 deletions
  1. +3
    -0
      .gitmodules
  2. +29
    -0
      plugins/Makefile
  3. +1
    -0
      plugins/MindMeldModular
  4. +40
    -0
      plugins/plugins.cpp

+ 3
- 0
.gitmodules View File

@@ -55,3 +55,6 @@
[submodule "plugins/cf"]
path = plugins/cf
url = https://github.com/cfoulc/cf.git
[submodule "plugins/MindMeldModular"]
path = plugins/MindMeldModular
url = https://github.com/MarcBoule/MindMeldModular.git

+ 29
- 0
plugins/Makefile View File

@@ -227,6 +227,20 @@ endif
# modules/types which are present in other plugins
JW_CUSTOM = Quantizer

# --------------------------------------------------------------
# MindMeld

PLUGIN_FILES += $(wildcard MindMeldModular/src/*.cpp)
PLUGIN_FILES += $(wildcard MindMeldModular/src/dsp/*.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/ShapeMaster/*.cpp)
PLUGIN_FILES += $(wildcard MindMeldModular/src/Utilities/*.cpp)

# modules/types which are present in other plugins
MINDMELD_CUSTOM = printNote

# --------------------------------------------------------------
# rackwindows

@@ -554,6 +568,21 @@ $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp
-IJW-Modules/src \
-IJW-Modules/lib/oscpack

$(BUILD_DIR)/MindMeldModular/%.cpp.o: MindMeldModular/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(MINDMELD_CUSTOM),$(call custom_module_names,$(m),JW)) \
-DpluginInstance=pluginInstance__MindMeld

$(BUILD_DIR)/MindMeldModular/MindMeldModular.cpp.o: MindMeldModular/src/MindMeldModular.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(MINDMELD_CUSTOM),$(call custom_module_names,$(m),JW)) \
-DpluginInstance=pluginInstance__MindMeld \
-Dinit=init__MindMeld

$(BUILD_DIR)/rackwindows/%.cpp.o: rackwindows/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"


+ 1
- 0
plugins/MindMeldModular

@@ -0,0 +1 @@
Subproject commit 786d711d5ea276c79aa247301f9604d8e425f1aa

+ 40
- 0
plugins/plugins.cpp View File

@@ -217,6 +217,22 @@ extern Model *modelBlankPanel;
#include "JW-Modules/src/JWModules.hpp"
#undef modelQuantizer

// MindMeldModular
/* 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 *modelEqMaster;
extern Model *modelEqExpander;
extern Model *modelBassMaster;
extern Model *modelBassMasterJr;
extern Model *modelShapeMaster;

// rackwindows
#include "rackwindows/src/plugin.hpp"

@@ -256,6 +272,7 @@ Plugin* pluginInstance__Fundamental;
Plugin* pluginInstance__GrandeModular;
extern Plugin* pluginInstance__ImpromptuModular;
Plugin* pluginInstance__JW;
extern Plugin* pluginInstance__MindMeld;
Plugin* pluginInstance__rackwindows;
Plugin* pluginInstance__ValleyAudio;
Plugin* pluginInstance__ZetaCarinaeModules;
@@ -956,6 +973,28 @@ static void initStatic__JW()
}
}

static void initStatic__MindMeld()
{
Plugin* const p = new Plugin;
pluginInstance__MindMeld = p;

const StaticPluginLoader spl(p, "MindMeldModular");
if (spl.ok())
{
p->addModel(modelMixMasterJr);
p->addModel(modelAuxExpanderJr);
p->addModel(modelMixMaster);
p->addModel(modelAuxExpander);
p->addModel(modelMeld);
p->addModel(modelUnmeld);
p->addModel(modelEqMaster);
p->addModel(modelEqExpander);
p->addModel(modelBassMaster);
p->addModel(modelBassMasterJr);
p->addModel(modelShapeMaster);
}
}

static void initStatic__rackwindows()
{
Plugin* const p = new Plugin;
@@ -1045,6 +1084,7 @@ void initStaticPlugins()
initStatic__GrandeModular();
initStatic__ImpromptuModular();
initStatic__JW();
initStatic__MindMeld();
initStatic__rackwindows();
/* does not build against v2
initStatic__ValleyAudio();


Loading…
Cancel
Save