Browse Source

Add AmalgamatedHarmonics; Make UI resizable

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 3 years ago
parent
commit
9b872dfd50
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
7 changed files with 55 additions and 4 deletions
  1. +3
    -0
      .gitmodules
  2. +1
    -0
      plugins/AmalgamatedHarmonics
  3. +10
    -0
      plugins/Makefile
  4. +37
    -0
      plugins/plugins.cpp
  5. +0
    -3
      plugins/todo.txt
  6. +3
    -0
      src/CardinalUI.cpp
  7. +1
    -1
      src/DistrhoPluginInfo.h

+ 3
- 0
.gitmodules View File

@@ -49,3 +49,6 @@
[submodule "plugins/ImpromptuModular"] [submodule "plugins/ImpromptuModular"]
path = plugins/ImpromptuModular path = plugins/ImpromptuModular
url = https://github.com/MarcBoule/ImpromptuModular.git url = https://github.com/MarcBoule/ImpromptuModular.git
[submodule "plugins/AmalgamatedHarmonics"]
path = plugins/AmalgamatedHarmonics
url = https://github.com/jhoar/AmalgamatedHarmonics.git

+ 1
- 0
plugins/AmalgamatedHarmonics

@@ -0,0 +1 @@
Subproject commit 29051928e469b9a039099a570b8ac06c3fc2e76b

+ 10
- 0
plugins/Makefile View File

@@ -18,6 +18,11 @@ include ../dpf/Makefile.base.mk


PLUGIN_FILES = plugins.cpp PLUGIN_FILES = plugins.cpp


# --------------------------------------------------------------
# AmalgamatedHarmonics

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

# -------------------------------------------------------------- # --------------------------------------------------------------
# AnimatedCircuits # AnimatedCircuits


@@ -320,6 +325,11 @@ $(BUILD_DIR)/plugins.cpp.o: plugins.cpp
@echo "Compiling $<" @echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -IBogaudioModules/lib -IBogaudioModules/src/dsp -c -o $@ $(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 $(BUILD_DIR)/AnimatedCircuits/%.cpp.o: AnimatedCircuits/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<" @echo "Compiling $<"


+ 37
- 0
plugins/plugins.cpp View File

@@ -19,6 +19,9 @@


#include "DistrhoUtils.hpp" #include "DistrhoUtils.hpp"


// AmalgamatedHarmonics
#include "AmalgamatedHarmonics/src/AH.hpp"

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


@@ -230,6 +233,7 @@ void saveDirectOutMode(bool) {}
void saveHighQualityAsDefault(bool) {} void saveHighQualityAsDefault(bool) {}


// plugin instances // plugin instances
Plugin* pluginInstance__AmalgamatedHarmonics;
Plugin* pluginInstance__AnimatedCircuits; Plugin* pluginInstance__AnimatedCircuits;
Plugin* pluginInstance__AS; Plugin* pluginInstance__AS;
Plugin* pluginInstance__AudibleInstruments; 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() static void initStatic__AnimatedCircuits()
{ {
Plugin* const p = new Plugin; Plugin* const p = new Plugin;
@@ -961,6 +997,7 @@ static void initStatic__ZetaCarinaeModules()
void initStaticPlugins() void initStaticPlugins()
{ {
initStatic__Core(); initStatic__Core();
initStatic__AmalgamatedHarmonics();
initStatic__AnimatedCircuits(); initStatic__AnimatedCircuits();
initStatic__AS(); initStatic__AS();
initStatic__AudibleInstruments(); initStatic__AudibleInstruments();


+ 0
- 3
plugins/todo.txt View File

@@ -12,9 +12,6 @@ Grayscale 74754.0 (not opensource?)


VultModulesFree 61804.0 (not opensource?) VultModulesFree 61804.0 (not opensource?)


AmalgamatedHarmonics 59071.0
https://github.com/jhoar/AmalgamatedHarmonics

NYSTHI 58494.0 (not opensource?) NYSTHI 58494.0 (not opensource?)


DrumKit 58468.0 DrumKit 58468.0


+ 3
- 0
src/CardinalUI.cpp View File

@@ -68,6 +68,9 @@ public:
fContext(getRackContextFromPlugin(getPluginInstancePointer())), fContext(getRackContextFromPlugin(getPluginInstancePointer())),
fResizeHandle(this) fResizeHandle(this)
{ {
if (isResizable())
fResizeHandle.hide();

const ScopedContext sc(this); const ScopedContext sc(this);


fContext->event = new rack::widget::EventState; fContext->event = new rack::widget::EventState;


+ 1
- 1
src/DistrhoPluginInfo.h View File

@@ -30,7 +30,7 @@
// #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:AnalyserPlugin" // #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:AnalyserPlugin"
// #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Analyzer" // #define DISTRHO_PLUGIN_VST3_CATEGORIES "Fx|Analyzer"
#define DISTRHO_UI_USE_NANOVG 1 #define DISTRHO_UI_USE_NANOVG 1
#define DISTRHO_UI_USER_RESIZABLE 0
#define DISTRHO_UI_USER_RESIZABLE 1


enum Parameters { enum Parameters {
kParameterCount kParameterCount


Loading…
Cancel
Save