diff --git a/.gitmodules b/.gitmodules index 5a17e380..6901c83d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -34,3 +34,6 @@ [submodule "plugins/Bidoo"] path = plugins/Bidoo url = https://github.com/sebastien-bouffier/Bidoo.git +[submodule "plugins/ESeries"] + path = plugins/ESeries + url = https://github.com/VCVRack/ESeries.git diff --git a/plugins/ESeries b/plugins/ESeries new file mode 160000 index 00000000..e584aa67 --- /dev/null +++ b/plugins/ESeries @@ -0,0 +1 @@ +Subproject commit e584aa67c20ee856158626b0091baebcefa2d663 diff --git a/plugins/Makefile b/plugins/Makefile index f1cf01df..81517aeb 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -152,6 +152,11 @@ BOGAUDIO_CUSTOM = ADSR LFO Noise VCA VCO VCF PLUGIN_FILES += $(wildcard Cardinal/src/*.cpp) +# -------------------------------------------------------------- +# ESeries + +PLUGIN_FILES += ESeries/src/E340.cpp + # -------------------------------------------------------------- # Fundamental @@ -305,6 +310,11 @@ $(BUILD_DIR)/Cardinal/%.cpp.o: Cardinal/%.cpp @echo "Compiling $<" $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__Cardinal -c -o $@ +$(BUILD_DIR)/ESeries/%.cpp.o: ESeries/%.cpp + -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" + @echo "Compiling $<" + $(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -DpluginInstance=pluginInstance__ESeries -c -o $@ + $(BUILD_DIR)/Fundamental/%.cpp.o: Fundamental/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @echo "Compiling $<" diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index 6b50defa..4d6d8868 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -156,6 +156,9 @@ // Cardinal (built-in) #include "Cardinal/src/plugin.hpp" +// ESeries +#include "ESeries/src/plugin.hpp" + // Fundamental #include "Fundamental/src/plugin.hpp" @@ -171,6 +174,7 @@ Plugin* pluginInstance__Befaco; Plugin* pluginInstance__Bidoo; Plugin* pluginInstance__BogaudioModules; Plugin* pluginInstance__Cardinal; +Plugin* pluginInstance__ESeries; Plugin* pluginInstance__Fundamental; Plugin* pluginInstance__GrandeModular; Plugin* pluginInstance__ZetaCarinaeModules; @@ -594,6 +598,18 @@ static void initStatic__Cardinal() } } +static void initStatic__ESeries() +{ + Plugin* const p = new Plugin; + pluginInstance__ESeries = p; + + const StaticPluginLoader spl(p, "ESeries"); + if (spl.ok()) + { + p->addModel(modelE340); + } +} + static void initStatic__Fundamental() { Plugin* const p = new Plugin; @@ -684,6 +700,7 @@ void initStaticPlugins() initStatic__Bidoo(); initStatic__BogaudioModules(); initStatic__Cardinal(); + initStatic__ESeries(); initStatic__Fundamental(); initStatic__GrandeModular(); initStatic__ZetaCarinaeModules(); diff --git a/plugins/todo.txt b/plugins/todo.txt index 75cbe051..24e559ee 100644 --- a/plugins/todo.txt +++ b/plugins/todo.txt @@ -1,7 +1,5 @@ List of plugins still to add, sorted by popularity -ESeries 94243.0 - Grayscale 74754.0 JW-Modules 65172.0 AS 64626.0 @@ -18,7 +16,7 @@ ArableInstruments 48756.0 squinkylabs-plug1 48682.0 SonusModular 45245.0 LindenbergResearch 43959.0 -Bidoo 43471.0 + Geodesics 42761.0 mscHack 42316.0 BaconMusic 42095.0 diff --git a/src/dep.cpp b/src/dep.cpp index 85d54be4..1b1b7ae3 100644 --- a/src/dep.cpp +++ b/src/dep.cpp @@ -49,9 +49,9 @@ FILE* fopen_u8(const char* filename, const char* mode) // Define the global names to indicate this is Cardinal and not VCVRack namespace rack { -const std::string APP_NAME = ""; +const std::string APP_NAME = "Cardinal"; const std::string APP_EDITION = ""; -const std::string APP_EDITION_NAME = "Cardinal Audio Plugin"; +const std::string APP_EDITION_NAME = "Audio Plugin"; const std::string APP_VERSION_MAJOR = "2"; const std::string APP_VERSION = "2.0"; #if defined(ARCH_WIN)