Browse Source

DrumKit (#31)

* Add DrumKit

* Add a few custom replacements for DrumKit

* Correct last commit
tags/22.02
Filipe Coelho GitHub 3 years ago
parent
commit
4cabc3690c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 54 additions and 2 deletions
  1. +3
    -0
      .gitmodules
  2. +1
    -0
      plugins/DrumKit
  3. +22
    -2
      plugins/Makefile
  4. +28
    -0
      plugins/plugins.cpp

+ 3
- 0
.gitmodules View File

@@ -61,3 +61,6 @@
[submodule "plugins/ValleyAudio"]
path = plugins/ValleyAudio
url = https://github.com/ValleyAudio/ValleyRackFree.git
[submodule "plugins/DrumKit"]
path = plugins/DrumKit
url = https://github.com/SVModular/DrumKit.git

+ 1
- 0
plugins/DrumKit

@@ -0,0 +1 @@
Subproject commit 58755a32837522a64b6b886b764dbefc9a2b8fd3

+ 22
- 2
plugins/Makefile View File

@@ -341,6 +341,18 @@ BOGAUDIO_CUSTOM_PER_FILE = ARQuantity AttackMenuItem ReleaseMenuItem

PLUGIN_FILES += $(filter-out cf/src/plugin.cpp,$(wildcard cf/src/*.cpp))

# --------------------------------------------------------------
# DrumKit

PLUGIN_FILES += $(wildcard DrumKit/src/*.cpp)
PLUGIN_FILES += $(wildcard DrumKit/src/controller/*.cpp)
PLUGIN_FILES += $(wildcard DrumKit/src/view/*.cpp)
PLUGIN_FILES += $(wildcard DrumKit/src/model/*.cpp)
PLUGIN_FILES += $(wildcard DrumKit/deps/*.cpp)
PLUGIN_FILES += $(wildcard DrumKit/deps/SynthDevKit/src/*.cpp)

DRUMKIT_CUSTOM = ADSR Envelope LowFrequencyOscillator

# --------------------------------------------------------------
# ESeries

@@ -749,6 +761,14 @@ $(BUILD_DIR)/cf/src/%.cpp.o: cf/src/%.cpp
$(foreach m,$(CF_CUSTOM),$(call custom_module_names,$(m),cf)) \
-DpluginInstance=pluginInstance__cf

$(BUILD_DIR)/DrumKit/%.cpp.o: DrumKit/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(DRUMKIT_CUSTOM),$(call custom_module_names,$(m),DrumKit)) \
-DpluginInstance=pluginInstance__DrumKit \
-Dinit=init__DrumKit

$(BUILD_DIR)/ESeries/%.cpp.o: ESeries/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
@@ -783,8 +803,8 @@ $(BUILD_DIR)/ImpromptuModular/%.cpp.o: ImpromptuModular/%.cpp
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(IMPROMPTUMODULAR_CUSTOM),$(call custom_module_names,$(m),ImpromptuModular)) \
$(foreach m,$(IMPROMPTUMODULAR_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),ImpromptuModular_$(shell basename $*))) \
-Dinit=init__ImpromptuModular \
-DpluginInstance=pluginInstance__ImpromptuModular
-DpluginInstance=pluginInstance__ImpromptuModular \
-Dinit=init__ImpromptuModular

$(BUILD_DIR)/ImpromptuModular/src/Foundr%.cpp.o: ImpromptuModular/src/Foundr%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"


+ 28
- 0
plugins/plugins.cpp View File

@@ -172,6 +172,9 @@
// cf
#include "cf/src/plugin.hpp"

// DrumKit
#include "DrumKit/src/DrumKit.hpp"

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

@@ -267,6 +270,7 @@ Plugin* pluginInstance__Befaco;
Plugin* pluginInstance__Bidoo;
Plugin* pluginInstance__BogaudioModules;
Plugin* pluginInstance__cf;
extern Plugin* pluginInstance__DrumKit;
Plugin* pluginInstance__ESeries;
Plugin* pluginInstance__Fundamental;
Plugin* pluginInstance__GrandeModular;
@@ -826,6 +830,29 @@ static void initStatic__cf()
}
}

static void initStatic__DrumKit()
{
Plugin* const p = new Plugin;
pluginInstance__DrumKit = p;

const StaticPluginLoader spl(p, "DrumKit");
if (spl.ok())
{
p->addModel(modelBD9);
p->addModel(modelSnare);
p->addModel(modelClosedHH);
p->addModel(modelOpenHH);
p->addModel(modelDMX);
p->addModel(modelCR78);
p->addModel(modelSBD);
p->addModel(modelGnome);
p->addModel(modelSequencer);
p->addModel(modelTomi);
p->addModel(modelBaronial);
p->addModel(modelMarionette);
}
}

static void initStatic__ESeries()
{
Plugin* const p = new Plugin;
@@ -1085,6 +1112,7 @@ void initStaticPlugins()
initStatic__Bidoo();
initStatic__BogaudioModules();
initStatic__cf();
initStatic__DrumKit();
initStatic__ESeries();
initStatic__Fundamental();
initStatic__GrandeModular();


Loading…
Cancel
Save