Browse Source

Merge 8e5aa2937b into 52fa1604f0

pull/748/merge
rl2939 GitHub 1 week ago
parent
commit
e85ac45ec0
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
6 changed files with 36 additions and 1 deletions
  1. +3
    -1
      .gitmodules
  2. +1
    -0
      README.md
  3. +2
    -0
      docs/LICENSES.md
  4. +12
    -0
      plugins/Makefile
  5. +1
    -0
      plugins/NocturnalEncoder
  6. +17
    -0
      plugins/plugins.cpp

+ 3
- 1
.gitmodules View File

@@ -260,4 +260,6 @@
[submodule "plugins/admiral"] [submodule "plugins/admiral"]
path = plugins/admiral path = plugins/admiral
url = https://github.com/wapiflapi/admiral.git url = https://github.com/wapiflapi/admiral.git

[submodule "plugins/NocturnalEncoder"]
path = plugins/NocturnalEncoder
url = https://github.com/djpeterso23662/NocturnalEncoder.git

+ 1
- 0
README.md View File

@@ -177,6 +177,7 @@ At the moment the following 3rd-party modules are provided:
- [MSM](https://github.com/netboy3/MSM-vcvrack-plugin) - [MSM](https://github.com/netboy3/MSM-vcvrack-plugin)
- [MUS-X](https://github.com/Jojosito/MUS-X) - [MUS-X](https://github.com/Jojosito/MUS-X)
- [Myth](https://github.com/Ahineya/vcv-myth-plugin) - [Myth](https://github.com/Ahineya/vcv-myth-plugin)
- [Nocturnal Encoder](https://github.com/djpeterso23662/NocturnalEncoder)
- [Nonlinear Circuits](https://github.com/mhetrick/nonlinearcircuits) - [Nonlinear Circuits](https://github.com/mhetrick/nonlinearcircuits)
- [Orbits](https://github.com/RareBreeds/Orbits) - [Orbits](https://github.com/RareBreeds/Orbits)
- [Parable Instruments](https://github.com/adbrant/ArableInstruments) - [Parable Instruments](https://github.com/adbrant/ArableInstruments)


+ 2
- 0
docs/LICENSES.md View File

@@ -71,6 +71,7 @@ Below follows a list of all code licenses used in Cardinal and linked submodules
| MSM | MIT | Repo's [LICENSE-dist.md](https://github.com/netboy3/MSM-vcvrack-plugin/issues/10) includes wrong information | | MSM | MIT | Repo's [LICENSE-dist.md](https://github.com/netboy3/MSM-vcvrack-plugin/issues/10) includes wrong information |
| MUS-X | GPL-3.0-or-later | | | MUS-X | GPL-3.0-or-later | |
| Myth | GPL-3.0-or-later | | | Myth | GPL-3.0-or-later | |
| NocturnalEncoder | BSD-3-Clause | |
| Nonlinear Circuits | CC0-1.0 | | | Nonlinear Circuits | CC0-1.0 | |
| Orbits | GPL-3.0-or-later | | | Orbits | GPL-3.0-or-later | |
| Parable Instruments | GPL-3.0-or-later | | | Parable Instruments | GPL-3.0-or-later | |
@@ -231,6 +232,7 @@ Below is a list of artwork licenses from plugins
| MSM/Fonts/Sudo.ttf | OFL-1.1-no-RFN | | | MSM/Fonts/Sudo.ttf | OFL-1.1-no-RFN | |
| MUS-X/* | GPL-3.0-or-later | No artwork specific license provided | | MUS-X/* | GPL-3.0-or-later | No artwork specific license provided |
| Myth/* | GPL-3.0-or-later | No artwork specific license provided | | Myth/* | GPL-3.0-or-later | No artwork specific license provided |
| NocturnalEncoder/* | BSD-3-Clause | No artwork specific license provided |
| nonlinearcircuits/* | CC0-1.0 | No artwork specific license provided | | nonlinearcircuits/* | CC0-1.0 | No artwork specific license provided |
| nonlinearcircuits/Audiowide-Regular.ttf | OFL-1.1-RFN | | | nonlinearcircuits/Audiowide-Regular.ttf | OFL-1.1-RFN | |
| Orbits/* | CC-BY-NC-ND-4.0 | | | Orbits/* | CC-BY-NC-ND-4.0 | |


+ 12
- 0
plugins/Makefile View File

@@ -950,6 +950,11 @@ PLUGIN_FILES += $(filter-out MUS-X/src/plugin.cpp,$(wildcard MUS-X/src/*.cpp))


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


# --------------------------------------------------------------
# Nocturnal Encoder

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

# -------------------------------------------------------------- # --------------------------------------------------------------
# Nonlinear Circuits # Nonlinear Circuits


@@ -2648,6 +2653,13 @@ $(BUILD_DIR)/myth-modules/%.cpp.o: myth-modules/%.cpp
$(foreach m,$(MYTH_MODULES_CUSTOM),$(call custom_module_names,$(m),myth_modules)) \ $(foreach m,$(MYTH_MODULES_CUSTOM),$(call custom_module_names,$(m),myth_modules)) \
-DpluginInstance=pluginInstance__myth_modules -DpluginInstance=pluginInstance__myth_modules


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

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


+ 1
- 0
plugins/NocturnalEncoder

@@ -0,0 +1 @@
Subproject commit 7008233b9990fa8bc2749857cdb76260313fe7c8

+ 17
- 0
plugins/plugins.cpp View File

@@ -786,6 +786,9 @@ extern Model* modelBlankPanel;
// myth-modules // myth-modules
#include "myth-modules/src/plugin.hpp" #include "myth-modules/src/plugin.hpp"


// Nocturnal Encoder
#include "NocturnalEncoder/src/plugin.hpp"

// Nonlinear Circuits // Nonlinear Circuits
#include "nonlinearcircuits/src/NLC.hpp" #include "nonlinearcircuits/src/NLC.hpp"


@@ -982,6 +985,7 @@ extern Plugin* pluginInstance__mscHack;
Plugin* pluginInstance__MSM; Plugin* pluginInstance__MSM;
Plugin* pluginInstance__MUS_X; Plugin* pluginInstance__MUS_X;
Plugin* pluginInstance__myth_modules; Plugin* pluginInstance__myth_modules;
Plugin* pluginInstance__NocturnalEncoder;
Plugin* pluginInstance__nonlinearcircuits; Plugin* pluginInstance__nonlinearcircuits;
Plugin* pluginInstance__Orbits; Plugin* pluginInstance__Orbits;
Plugin* pluginInstance__ParableInstruments; Plugin* pluginInstance__ParableInstruments;
@@ -2969,6 +2973,18 @@ static void initStatic__myth_modules()
} }
} }


static void initStatic__NocturnalEncoder()
{
Plugin* const p = new Plugin;
pluginInstance__NocturnalEncoder = p;

const StaticPluginLoader spl(p, "NocturnalEncoder");
if (spl.ok())
{
p->addModel(modelAMDecoder);
p->addModel(modelAMEncoder);
}
}
static void initStatic__nonlinearcircuits() static void initStatic__nonlinearcircuits()
{ {
Plugin* const p = new Plugin; Plugin* const p = new Plugin;
@@ -3610,6 +3626,7 @@ void initStaticPlugins()
initStatic__MSM(); initStatic__MSM();
initStatic__MUS_X(); initStatic__MUS_X();
initStatic__myth_modules(); initStatic__myth_modules();
initStatic__NocturnalEncoder();
initStatic__nonlinearcircuits(); initStatic__nonlinearcircuits();
initStatic__Orbits(); initStatic__Orbits();
initStatic__ParableInstruments(); initStatic__ParableInstruments();


Loading…
Cancel
Save