Browse Source

add CatroModulo (#175)

* add CatroModulo

* put / in project name
tags/22.03
dreamer GitHub 3 years ago
parent
commit
1278df9dc8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 46 additions and 0 deletions
  1. +3
    -0
      .gitmodules
  2. +1
    -0
      README.md
  3. +3
    -0
      docs/LICENSES.md
  4. +1
    -0
      plugins/CatroModulo
  5. +12
    -0
      plugins/Makefile
  6. +26
    -0
      plugins/plugins.cpp

+ 3
- 0
.gitmodules View File

@@ -157,3 +157,6 @@
[submodule "plugins/stocaudio"]
path = plugins/stocaudio
url = https://github.com/aptrn/stocaudio-modules.git
[submodule "plugins/CatroModulo"]
path = plugins/CatroModulo
url = https://github.com/catronomix/catro-modulo.git

+ 1
- 0
README.md View File

@@ -114,6 +114,7 @@ At the moment the following 3rd-party modules are provided:
- Befaco
- Bidoo
- Bogaudio
- Catro/Modulo
- cf
- ChowDSP
- DrumKit


+ 3
- 0
docs/LICENSES.md View File

@@ -25,6 +25,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| Befaco | GPL-3.0-or-later | |
| Bidoo | GPL-3.0-or-later | |
| Bogaudio | GPL-3.0-or-later | |
| Catro/Modulo | BSD-3-Clause | |
| cf | BSD-3-Clause | |
| ChowDSP | GPL-3.0-or-later | |
| DrumKit | CC0-1.0 | |
@@ -105,6 +106,8 @@ Below is a list of artwork licenses from plugins
| BogaudioModules/fonts/inconsolata*.ttf | OFL-1.1-no-RFN | |
| Cardinal/* | CC0-1.0 | |
| Cardinal/Miku/Miku.png | CC-BY-NC-3.0 | https://piapro.net/intl/en_for_creators.html |
| CatroModulo/* | BSD-3-Clause | No artwork specific license provided |
| CatroModulo/Segment7Standard.ttf | OFL-1.1-RFN | |
| cf/* | BSD-3-Clause | No artwork specific license provided |
| cf/DejaVuSansMono.ttf | Bitstream-Vera | |
| cf/Segment7Standard.ttf | OFL-1.1-RFN | |


+ 1
- 0
plugins/CatroModulo

@@ -0,0 +1 @@
Subproject commit 80422acf5a0cf5d4e8f14298e7f41ff8fab39543

+ 12
- 0
plugins/Makefile View File

@@ -429,6 +429,11 @@ PLUGIN_FILES += $(filter-out ChowDSP/src/Credit.cpp,$(wildcard ChowDSP/src/*/*.c
PLUGIN_FILES += $(wildcard ChowDSP/src/*/*/*.cpp)
PLUGIN_FILES += $(wildcard ChowDSP/lib/r8lib/*.cpp)

# --------------------------------------------------------------
# CatroModulo

PLUGIN_FILES += $(wildcard CatroModulo/src/*.cpp)

# --------------------------------------------------------------
# cf

@@ -1214,6 +1219,13 @@ $(BUILD_DIR)/BogaudioModules/%.cpp.o: BogaudioModules/%.cpp
-IBogaudioModules/lib \
-IBogaudioModules/src/dsp

$(BUILD_DIR)/CatroModulo/src/%.cpp.o: CatroModulo/src/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(CATROMODULO_CUSTOM),$(call custom_module_names,$(m),CatroModulo)) \
-DpluginInstance=pluginInstance__CatroModulo

$(BUILD_DIR)/cf/src/%.cpp.o: cf/src/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"


+ 26
- 0
plugins/plugins.cpp View File

@@ -267,6 +267,9 @@ extern Model* modelTestVCF;
#undef modelVCF
#undef modelVCO

// CatroModulo
#include "CatroModulo/src/CatroModulo.hpp"

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

@@ -634,6 +637,7 @@ Plugin* pluginInstance__Bacon;
Plugin* pluginInstance__Befaco;
Plugin* pluginInstance__Bidoo;
Plugin* pluginInstance__BogaudioModules;
Plugin* pluginInstance__CatroModulo;
Plugin* pluginInstance__cf;
Plugin* pluginInstance__ChowDSP;
extern Plugin* pluginInstance__DrumKit;
@@ -1279,6 +1283,27 @@ static void initStatic__BogaudioModules()
}
}

static void initStatic__CatroModulo()
{
Plugin* const p = new Plugin;
pluginInstance__CatroModulo = p;

const StaticPluginLoader spl(p, "CatroModulo");
if (spl.ok())
{
p->addModel(modelCM1Module);
p->addModel(modelCM2Module);
p->addModel(modelCM3Module);
p->addModel(modelCM4Module);
p->addModel(modelCM5Module);
p->addModel(modelCM6Module);
p->addModel(modelCM7Module);
p->addModel(modelCM8Module);
p->addModel(modelCM9Module);
p->addModel(modelCM10Module);
}
}

static void initStatic__cf()
{
Plugin* const p = new Plugin;
@@ -2216,6 +2241,7 @@ void initStaticPlugins()
initStatic__Befaco();
initStatic__Bidoo();
initStatic__BogaudioModules();
initStatic__CatroModulo();
initStatic__cf();
initStatic__ChowDSP();
initStatic__DrumKit();


Loading…
Cancel
Save