Browse Source

adding Lilac Loop

tags/22.03
dreamer Filipe Coelho <falktx@falktx.com> 3 years ago
parent
commit
fef10bb2cc
7 changed files with 38 additions and 0 deletions
  1. +3
    -0
      .gitmodules
  2. +1
    -0
      README.md
  3. +2
    -0
      docs/LICENSES.md
  4. +1
    -0
      plugins/LilacLoop
  5. +12
    -0
      plugins/Makefile
  6. +17
    -0
      plugins/plugins.cpp
  7. +2
    -0
      src/custom/dep.cpp

+ 3
- 0
.gitmodules View File

@@ -160,3 +160,6 @@
[submodule "plugins/CatroModulo"] [submodule "plugins/CatroModulo"]
path = plugins/CatroModulo path = plugins/CatroModulo
url = https://github.com/catronomix/catro-modulo.git url = https://github.com/catronomix/catro-modulo.git
[submodule "plugins/LilacLoop"]
path = plugins/LilacLoop
url = https://github.com/grough/lilac-loop-vcv.git

+ 1
- 0
README.md View File

@@ -131,6 +131,7 @@ At the moment the following 3rd-party modules are provided:
- Impromptu - Impromptu
- JW-Modules - JW-Modules
- LifeFormModular - LifeFormModular
- Lilac Loop
- Little Utils - Little Utils
- Lomas Modules - Lomas Modules
- Lyrae Modules - Lyrae Modules


+ 2
- 0
docs/LICENSES.md View File

@@ -42,6 +42,7 @@ Bellow follows a list of all code licenses used in Cardinal and linked submodule
| Impromptu | GPL-3.0-or-later | | | Impromptu | GPL-3.0-or-later | |
| JW-Modules | BSD-3-Clause | | | JW-Modules | BSD-3-Clause | |
| LifeFormModular | MIT | | | LifeFormModular | MIT | |
| Lilac Loop | GPL-3.0-or-later | |
| Little Utils | EUPL-1.2 | | | Little Utils | EUPL-1.2 | |
| Lomas Modules | GPL-3.0-or-later | | | Lomas Modules | GPL-3.0-or-later | |
| Lyrae Modules | GPL-3.0-or-later | | | Lyrae Modules | GPL-3.0-or-later | |
@@ -133,6 +134,7 @@ Below is a list of artwork licenses from plugins
| JW-Modules/* | BSD-3-Clause | No artwork specific license provided | | JW-Modules/* | BSD-3-Clause | No artwork specific license provided |
| JW-Modules/DejaVuSansMono.ttf | Bitstream-Vera | Unused in Cardinal | | JW-Modules/DejaVuSansMono.ttf | Bitstream-Vera | Unused in Cardinal |
| LifeFormModular/* | MIT | No artwork specific license provided | | LifeFormModular/* | MIT | No artwork specific license provided |
| LilacLoop/* | GPL-3.0-or-later | No artwork specific license provided |
| LittleUtils/* | EUPL-1.2 | Same license as source code | | LittleUtils/* | EUPL-1.2 | Same license as source code |
| LittleUtils/fonts/CooperHewitt-*.ttf | OFL-1.1-RFN | | | LittleUtils/fonts/CooperHewitt-*.ttf | OFL-1.1-RFN | |
| LittleUtils/fonts/Overpass-*.ttf | OFL-1.1-RFN | | | LittleUtils/fonts/Overpass-*.ttf | OFL-1.1-RFN | |


+ 1
- 0
plugins/LilacLoop

@@ -0,0 +1 @@
Subproject commit 69d8d66521175cd561d53e65728d460b398950c9

+ 12
- 0
plugins/Makefile View File

@@ -577,6 +577,11 @@ PLUGIN_FILES += $(filter-out LifeFormModular/src/plugin.cpp,$(wildcard LifeFormM
# modules/types which are present in other plugins # modules/types which are present in other plugins
LIFEFORMMODULAR_CUSTOM = IO MS __ct_base __ct_comp LIFEFORMMODULAR_CUSTOM = IO MS __ct_base __ct_comp


# --------------------------------------------------------------
# Lilac Loop

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

# -------------------------------------------------------------- # --------------------------------------------------------------
# LittleUtils # LittleUtils


@@ -1417,6 +1422,13 @@ $(BUILD_DIR)/LifeFormModular/%.cpp.o: LifeFormModular/%.cpp
$(foreach m,$(LIFEFORMMODULAR_CUSTOM),$(call custom_module_names,$(m),LifeFormModular)) \ $(foreach m,$(LIFEFORMMODULAR_CUSTOM),$(call custom_module_names,$(m),LifeFormModular)) \
-DpluginInstance=pluginInstance__LifeFormModular -DpluginInstance=pluginInstance__LifeFormModular


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

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


+ 17
- 0
plugins/plugins.cpp View File

@@ -431,6 +431,9 @@ extern Model* modelDriftgen;
// LittleUtils // LittleUtils
#include "LittleUtils/src/plugin.hpp" #include "LittleUtils/src/plugin.hpp"


// Lilac Loop
#include "LilacLoop/src/plugin.hpp"

// LomasModules // LomasModules
#include "LomasModules/src/plugin.hpp" #include "LomasModules/src/plugin.hpp"
#undef DR_WAV_IMPLEMENTATION #undef DR_WAV_IMPLEMENTATION
@@ -657,6 +660,7 @@ extern Plugin* pluginInstance__ImpromptuModular;
Plugin* pluginInstance__ihtsyn; Plugin* pluginInstance__ihtsyn;
Plugin* pluginInstance__JW; Plugin* pluginInstance__JW;
Plugin* pluginInstance__LifeFormModular; Plugin* pluginInstance__LifeFormModular;
Plugin* pluginInstance__LilacLoop;
Plugin* pluginInstance__LittleUtils; Plugin* pluginInstance__LittleUtils;
Plugin* pluginInstance__Lomas; Plugin* pluginInstance__Lomas;
Plugin* pluginInstance__Lyrae; Plugin* pluginInstance__Lyrae;
@@ -1790,6 +1794,18 @@ static void initStatic__LifeFormModular()
} }
} }


static void initStatic__LilacLoop()
{
Plugin* const p = new Plugin;
pluginInstance__LilacLoop = p;

const StaticPluginLoader spl(p, "LilacLoop");
if (spl.ok())
{
p->addModel(modelLooperOne);
}
}

static void initStatic__LittleUtils() static void initStatic__LittleUtils()
{ {
Plugin* const p = new Plugin; Plugin* const p = new Plugin;
@@ -2263,6 +2279,7 @@ void initStaticPlugins()
initStatic__ihtsyn(); initStatic__ihtsyn();
initStatic__JW(); initStatic__JW();
initStatic__LifeFormModular(); initStatic__LifeFormModular();
initStatic__LilacLoop();
initStatic__LittleUtils(); initStatic__LittleUtils();
initStatic__Lomas(); initStatic__Lomas();
initStatic__Lyrae(); initStatic__Lyrae();


+ 2
- 0
src/custom/dep.cpp View File

@@ -234,6 +234,8 @@ static const struct {
{ "/JW-Modules/res/Trigs.svg", {}, -1 }, { "/JW-Modules/res/Trigs.svg", {}, -1 },
{ "/JW-Modules/res/WavHeadPanel.svg", {}, -1 }, { "/JW-Modules/res/WavHeadPanel.svg", {}, -1 },
{ "/JW-Modules/res/XYPad.svg", {}, -1 }, { "/JW-Modules/res/XYPad.svg", {}, -1 },
// GPL3.0-or-later
{ "/LilacLoop/res/Looper.svg", {}, -1 },
// EUPL-1.2 // EUPL-1.2
{ "/LittleUtils/res/Bias_Semitone.svg", {}, -1 }, { "/LittleUtils/res/Bias_Semitone.svg", {}, -1 },
{ "/LittleUtils/res/ButtonModule.svg", {}, -1 }, { "/LittleUtils/res/ButtonModule.svg", {}, -1 },


Loading…
Cancel
Save