diff --git a/.gitmodules b/.gitmodules index 14e605c..0dd8ca1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,3 +49,6 @@ [submodule "plugins/ImpromptuModular"] path = plugins/ImpromptuModular url = https://github.com/MarcBoule/ImpromptuModular.git +[submodule "plugins/AmalgamatedHarmonics"] + path = plugins/AmalgamatedHarmonics + url = https://github.com/jhoar/AmalgamatedHarmonics.git diff --git a/plugins/AmalgamatedHarmonics b/plugins/AmalgamatedHarmonics new file mode 160000 index 0000000..2905192 --- /dev/null +++ b/plugins/AmalgamatedHarmonics @@ -0,0 +1 @@ +Subproject commit 29051928e469b9a039099a570b8ac06c3fc2e76b diff --git a/plugins/Makefile b/plugins/Makefile index a8e5485..659b1eb 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -18,6 +18,11 @@ include ../dpf/Makefile.base.mk PLUGIN_FILES = plugins.cpp +# -------------------------------------------------------------- +# AmalgamatedHarmonics + +PLUGIN_FILES += $(filter-out AmalgamatedHarmonics/src/AH.cpp,$(wildcard AmalgamatedHarmonics/src/*.cpp)) + # -------------------------------------------------------------- # AnimatedCircuits @@ -320,6 +325,11 @@ $(BUILD_DIR)/plugins.cpp.o: plugins.cpp @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -IBogaudioModules/lib -IBogaudioModules/src/dsp -c -o $@ +$(BUILD_DIR)/AmalgamatedHarmonics/%.cpp.o: AmalgamatedHarmonics/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__AmalgamatedHarmonics -c -o $@ + $(BUILD_DIR)/AnimatedCircuits/%.cpp.o: AnimatedCircuits/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index b20e4b3..20e5871 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -19,6 +19,9 @@ #include "DistrhoUtils.hpp" +// AmalgamatedHarmonics +#include "AmalgamatedHarmonics/src/AH.hpp" + // AnimatedCircuits #include "AnimatedCircuits/src/plugin.hpp" @@ -230,6 +233,7 @@ void saveDirectOutMode(bool) {} void saveHighQualityAsDefault(bool) {} // plugin instances +Plugin* pluginInstance__AmalgamatedHarmonics; Plugin* pluginInstance__AnimatedCircuits; Plugin* pluginInstance__AS; Plugin* pluginInstance__AudibleInstruments; @@ -369,6 +373,38 @@ static void initStatic__Core() } } +static void initStatic__AmalgamatedHarmonics() +{ + Plugin* const p = new Plugin; + pluginInstance__AmalgamatedHarmonics = p; + + const StaticPluginLoader spl(p, "AmalgamatedHarmonics"); + if (spl.ok()) + { + p->addModel(modelArp31); + p->addModel(modelArp32); + p->addModel(modelBombe); + p->addModel(modelChord); + p->addModel(modelCircle); + p->addModel(modelGalaxy); + p->addModel(modelGenerative); + p->addModel(modelImp); + p->addModel(modelImperfect2); + p->addModel(modelProgress2); + p->addModel(modelRuckus); + p->addModel(modelScaleQuantizer2); + p->addModel(modelSLN); + p->addModel(modelMuxDeMux); + p->addModel(modelPolyProbe); + p->addModel(modelPolyScope); + p->addModel(modelPolyUtils); + p->addModel(modelPolyVolt); + p->addModel(modelScaleQuantizer); + p->addModel(modelArpeggiator2); + p->addModel(modelProgress); + } +} + static void initStatic__AnimatedCircuits() { Plugin* const p = new Plugin; @@ -961,6 +997,7 @@ static void initStatic__ZetaCarinaeModules() void initStaticPlugins() { initStatic__Core(); + initStatic__AmalgamatedHarmonics(); initStatic__AnimatedCircuits(); initStatic__AS(); initStatic__AudibleInstruments(); diff --git a/plugins/todo.txt b/plugins/todo.txt index 9141c43..c2064fb 100644 --- a/plugins/todo.txt +++ b/plugins/todo.txt @@ -12,9 +12,6 @@ Grayscale 74754.0 (not opensource?) VultModulesFree 61804.0 (not opensource?) -AmalgamatedHarmonics 59071.0 -https://github.com/jhoar/AmalgamatedHarmonics - NYSTHI 58494.0 (not opensource?) DrumKit 58468.0 diff --git a/src/CardinalUI.cpp b/src/CardinalUI.cpp index 0a8d7fa..8c2d520 100644 --- a/src/CardinalUI.cpp +++ b/src/CardinalUI.cpp @@ -68,6 +68,9 @@ public: fContext(getRackContextFromPlugin(getPluginInstancePointer())), fResizeHandle(this) { + if (isResizable()) + fResizeHandle.hide(); + const ScopedContext sc(this); fContext->event = new rack::widget::EventState; diff --git a/src/DistrhoPluginInfo.h b/src/DistrhoPluginInfo.h index 6d8ca52..8cd0d28 100644 --- a/src/DistrhoPluginInfo.h +++ b/src/DistrhoPluginInfo.h @@ -30,7 +30,7 @@ // #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:AnalyserPlugin" // #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Analyzer" #define DISTRHO_UI_USE_NANOVG 1 -#define DISTRHO_UI_USER_RESIZABLE 0 +#define DISTRHO_UI_USER_RESIZABLE 1 enum Parameters { kParameterCount