Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add Geodesics modules
Adding them was straightforward. A few symbols resulted in duplicates
when linking, hence the extra "-D" hackery in the plugins Makefile.
  • Loading branch information
jypma committed Jan 31, 2022
commit ace7b1ef1358078880f8ff31480dd9d810081fe1
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -139,3 +139,6 @@
[submodule "plugins/Autinn"]
path = plugins/Autinn
url = https://github.com/NikolaiVChr/Autinn.git
[submodule "plugins/Geodesics"]
path = plugins/Geodesics
url = https://github.com/MarcBoule/Geodesics.git
1 change: 1 addition & 0 deletions doc/LICENSES.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| ExpertSleepers Encoders | MIT | |
| Extratone | GPL-3.0-or-later | |
| Fehler Fabrik | GPL-3.0-or-later | |
| Geodesics | GPL-3.0 | (blocker for inclusion right now) |
| Glue the Giant | GPL-3.0-or-later | |
| Grande | GPL-3.0-or-later | |
| HetrickCV | CC0-1.0 | |
Expand Down
1 change: 1 addition & 0 deletions plugins/Geodesics
Submodule Geodesics added at ae163f
15 changes: 15 additions & 0 deletions plugins/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,11 @@ PLUGIN_FILES += Fundamental/src/dr_wav.c
FUNDAMENTAL_CUSTOM = $(DRWAV)
endif

# --------------------------------------------------------------
# Geodesics

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

# --------------------------------------------------------------
# GlueTheGiant

Expand Down Expand Up @@ -1129,6 +1134,16 @@ $(BUILD_DIR)/Fundamental/%.cpp.o: Fundamental/%.cpp
$(foreach m,$(FUNDAMENTAL_CUSTOM),$(call custom_module_names,$(m),Fundamental)) \
-DpluginInstance=pluginInstance__Fundamental

$(BUILD_DIR)/Geodesics/%.cpp.o: Geodesics/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(GEODESICS_CUSTOM),$(call custom_module_names,$(m),Geodesics)) \
-DpluginInstance=pluginInstance__Geodesics \
-DsaveDarkAsDefault=saveDarkAsDefault__Geodesics \
-DisDark=isDark__Geodesics \
-Dinit=init__Geodesics

$(BUILD_DIR)/GlueTheGiant/%.cpp.o: GlueTheGiant/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
Expand Down
26 changes: 26 additions & 0 deletions plugins/plugins.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,9 @@ void setupSamples();
#include "Fundamental/src/plugin.hpp"
#endif

// Geodesics
#include "Geodesics/src/Geodesics.hpp"

// GlueTheGiant
#include "GlueTheGiant/src/plugin.hpp"
bool audition_mixer = false;
Expand Down Expand Up @@ -568,6 +571,7 @@ Plugin* pluginInstance__FehlerFabrik;
#ifdef WITH_FUNDAMENTAL
Plugin* pluginInstance__Fundamental;
#endif
extern Plugin* pluginInstance__Geodesics;
Plugin* pluginInstance__GrandeModular;
Plugin* pluginInstance__GlueTheGiant;
Plugin* pluginInstance__HetrickCV;
Expand Down Expand Up @@ -1460,6 +1464,27 @@ static void initStatic__Fundamental()
}
#endif

static void initStatic__Geodesics()
{
Plugin* const p = new Plugin;
pluginInstance__Geodesics = p;

const StaticPluginLoader spl(p, "Geodesics");
if (spl.ok())
{
p->addModel(modelBlackHoles);
p->addModel(modelPulsars);
p->addModel(modelBranes);
p->addModel(modelIons);
p->addModel(modelEntropia);
p->addModel(modelEnergy);
p->addModel(modelTorus);
p->addModel(modelFate);
p->addModel(modelBlankLogo);
p->addModel(modelBlankInfo);
}
}

static void initStatic__GlueTheGiant()
{
Plugin* const p = new Plugin;
Expand Down Expand Up @@ -2003,6 +2028,7 @@ void initStaticPlugins()
#ifdef WITH_FUNDAMENTAL
initStatic__Fundamental();
#endif
initStatic__Geodesics();
initStatic__GlueTheGiant();
initStatic__GrandeModular();
initStatic__HetrickCV();
Expand Down
3 changes: 0 additions & 3 deletions plugins/todo.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ https://github.com/squinkylabs/SquinkyVCV

LindenbergResearch 43959.0 (not opensource?)

Geodesics 42761.0
https://github.com/MarcBoule/Geodesics

Alikins 41798.0
https://github.com/alikins/Alikins-rack-plugins

Expand Down