diff --git a/README.md b/README.md index 065d7052..90a12def 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ *Cardinal, the Rack!* Cardinal is a free and open-source virtual modular synthesizer plugin, -available as JACK standalone and AU, LV2, VST2, VST3 and CLAP audio plugin for FreeBSD, Linux, macOS and Windows. +available as CLAP, LV2, VST2 and VST3 audio plugin for FreeBSD, Linux, macOS and Windows. +Plus AU and JACK or Native audio standalone for some systems. It is based on the popular [VCV Rack](https://vcvrack.com/) but with a focus on being a fully self-contained plugin version. More specifically, this is a [DPF-based](https://github.com/DISTRHO/DPF/) diff --git a/dpf b/dpf index 8f664b4d..11a0877f 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 8f664b4d346ba8c40e6a5a0909ca813654721b1a +Subproject commit 11a0877fd5c289e8b2e770491c63548eca489d3b diff --git a/plugins/Makefile b/plugins/Makefile index 34bbb742..7e9682b4 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -393,14 +393,6 @@ PLUGIN_FILES += AS/freeverb/revmodel.cpp AS_CUSTOM = ADSR BpmDisplayWidget LabelDisplayWidget LedLight LowFrequencyOscillator SigDisplayWidget VCA WaveShaper YellowRedLight allpass comb revmodel AS_CUSTOM_PER_FILE = NumberDisplayWidget -# -------------------------------------------------------------- -# dBiz - -PLUGIN_FILES += $(filter-out dBiz/src/plugin.cpp,$(wildcard dBiz/src/*.cpp)) - -# modules/types which are present in other plugins -DBIZ_CUSTOM = Chord DarkDefaultItem Divider OrangeLight VCA4 darkPanelID lightPanelID - # -------------------------------------------------------------- # AudibleInstruments @@ -581,6 +573,15 @@ PLUGIN_FILES += $(filter-out cf/src/plugin.cpp,$(wildcard cf/src/*.cpp)) # modules/types which are present in other plugins CF_CUSTOM = $(DRWAV) +# -------------------------------------------------------------- +# dBiz + +PLUGIN_FILES += $(filter-out dBiz/src/plugin.cpp,$(wildcard dBiz/src/*.cpp)) + +# modules/types which are present in other plugins +DBIZ_CUSTOM = Chord DarkDefaultItem Divider FourSeq FourSeqWidget OrangeLight VCA4 Wavefolder darkPanelID lightPanelID +DBIZ_CUSTOM_PER_FILE = MultiFilter Oscillator calcOutput sineOsc subBank + # -------------------------------------------------------------- # DrumKit @@ -1512,7 +1513,6 @@ $(BUILD_DIR)/Autinn/%.cpp.o: Autinn/%.cpp -DpluginInstance=pluginInstance__Autinn \ -Dinit=init__Autinn - $(BUILD_DIR)/Axioma/%.cpp.o: Axioma/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" @@ -1609,6 +1609,7 @@ $(BUILD_DIR)/dBiz/src/%.cpp.o: dBiz/src/%.cpp @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \ $(foreach m,$(DBIZ_CUSTOM),$(call custom_module_names,$(m),dBiz)) \ + $(foreach m,$(DBIZ_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),dBiz_$(shell basename $*))) \ -DpluginInstance=pluginInstance__dBiz $(BUILD_DIR)/DrumKit/%.cpp.o: DrumKit/%.cpp diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 9c624aa5..65aa5f0a 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -316,26 +316,28 @@ extern Model* modelTestVCF; #include "ChowDSP/src/plugin.cpp" #undef init -// DrumKit -#include "DrumKit/src/DrumKit.hpp" -void setupSamples(); - // dBiz -#define darkPanelID dBizdarkPanelID #define DarkDefaultItem dBizDarkDefaultItem -#define lightPanelID dBizlightPanelID #define OrangeLight dBizOrangeLight +#define darkPanelID dBizdarkPanelID +#define lightPanelID dBizlightPanelID #define modelChord modeldBizChord -#define modelVCA4 modeldBizVCA4 #define modelDivider modeldBizDivider +#define modelFourSeq modeldBizFourSeq +#define modelVCA4 modeldBizVCA4 #include "dBiz/src/plugin.hpp" -#undef darkPanelID #undef DarkDefaultItem -#undef lightPanelID #undef OrangeLight +#undef darkPanelID +#undef lightPanelID #undef modelChord -#undef modelVCA4 #undef modelDivider +#undef modelFourSeq +#undef modelVCA4 + +// DrumKit +#include "DrumKit/src/DrumKit.hpp" +void setupSamples(); // ESeries #include "ESeries/src/plugin.hpp" @@ -1737,8 +1739,9 @@ static void initStatic__dBiz() if (spl.ok()) { #define modelChord modeldBizChord -#define modelVCA4 modeldBizVCA4 #define modelDivider modeldBizDivider +#define modelFourSeq modeldBizFourSeq +#define modelVCA4 modeldBizVCA4 p->addModel(modelNavControl); p->addModel(modelBench); p->addModel(modelContorno); @@ -1773,8 +1776,9 @@ static void initStatic__dBiz() p->addModel(modelOrder); p->addModel(modelDualMatrix); #undef modelChord -#undef modelVCA4 #undef modelDivider +#undef modelFourSeq +#undef modelVCA4 } }