Browse Source

Merge remote-tracking branch 'origin/mscHack' into main

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 3 years ago
parent
commit
2e3f9f468c
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
5 changed files with 93 additions and 4 deletions
  1. +3
    -0
      .gitmodules
  2. +13
    -0
      plugins/Makefile
  3. +1
    -0
      plugins/mscHack
  4. +64
    -0
      plugins/plugins.cpp
  5. +12
    -4
      plugins/todo.txt

+ 3
- 0
.gitmodules View File

@@ -70,3 +70,6 @@
[submodule "plugins/Atelier"]
path = plugins/Atelier
url = git@github.com:Xenakios/Atelier.git
[submodule "plugins/mscHack"]
path = plugins/mscHack
url = https://github.com/mschack/VCV-Rack-Plugins.git

+ 13
- 0
plugins/Makefile View File

@@ -433,6 +433,11 @@ PLUGIN_FILES += $(wildcard MindMeldModular/src/Utilities/*.cpp)
# modules/types which are present in other plugins
MINDMELD_CUSTOM = printNote

# --------------------------------------------------------------
# mscHack

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

# --------------------------------------------------------------
# rackwindows

@@ -900,6 +905,14 @@ $(BUILD_DIR)/MindMeldModular/MindMeldModular.cpp.o: MindMeldModular/src/MindMeld
-DpluginInstance=pluginInstance__MindMeld \
-Dinit=init__MindMeld

$(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
$(foreach m,$(MINDMELD_CUSTOM),$(call custom_module_names,$(m),JW)) \
-DthePlugin=pluginInstance__mscHack \
-Dinit=init__mscHack

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


+ 1
- 0
plugins/mscHack

@@ -0,0 +1 @@
Subproject commit c2f224941ca286c4630519c61e271ba7778402b3

+ 64
- 0
plugins/plugins.cpp View File

@@ -252,6 +252,34 @@ extern Model *modelBassMaster;
extern Model *modelBassMasterJr;
extern Model *modelShapeMaster;

// mscHack
/* NOTE too much noise in original include, do this a different way
// #include "mscHack/src/mscHack.hpp"
*/
extern Model *modelCompressor;
extern Model *modelSynthDrums;
extern Model *modelSEQ_6x32x16;
extern Model *modelMasterClockx8;
extern Model *modelMasterClockx4;
extern Model *modelSEQ_Envelope_8;
extern Model *modelSeq_Triad2;
extern Model *modelARP700;
extern Model *modelMix_24_4_4;
extern Model *modelMix_16_4_4;
extern Model *modelMix_9_3_4;
extern Model *modelMix_4_0_4;
extern Model *modelASAF8;
extern Model *modelPingPong;
extern Model *modelStepDelay;
extern Model *modelOsc_3Ch;
extern Model *modelDronez;
extern Model *modelMorze;
extern Model *modelWindz;
extern Model *modelLorenz;
extern Model *modelAlienz;
extern Model *modelOSC_WaveMorph_3;
extern Model *modelMaude_221;

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

@@ -292,6 +320,7 @@ Plugin* pluginInstance__GrandeModular;
extern Plugin* pluginInstance__ImpromptuModular;
Plugin* pluginInstance__JW;
extern Plugin* pluginInstance__MindMeld;
extern Plugin* pluginInstance__mscHack;
Plugin* pluginInstance__rackwindows;
Plugin* pluginInstance__ValleyAudio;
Plugin* pluginInstance__ZetaCarinaeModules;
@@ -1064,6 +1093,40 @@ static void initStatic__MindMeld()
}
}

static void initStatic__mscHack()
{
Plugin* const p = new Plugin;
pluginInstance__mscHack = p;

const StaticPluginLoader spl(p, "mscHack");
if (spl.ok())
{
p->addModel(modelCompressor);
p->addModel(modelSynthDrums);
p->addModel(modelSEQ_6x32x16);
p->addModel(modelMasterClockx4);
//p->addModel(modelMasterClockx8);
p->addModel(modelSEQ_Envelope_8);
p->addModel(modelSeq_Triad2);
p->addModel(modelARP700);
p->addModel(modelMix_4_0_4);
p->addModel(modelMix_9_3_4);
p->addModel(modelMix_16_4_4);
p->addModel(modelMix_24_4_4);
p->addModel(modelASAF8);
p->addModel(modelPingPong);
p->addModel(modelStepDelay);
p->addModel(modelOsc_3Ch);
p->addModel(modelDronez);
p->addModel(modelMorze);
p->addModel(modelWindz);
p->addModel(modelLorenz);
p->addModel(modelAlienz);
p->addModel(modelOSC_WaveMorph_3);
p->addModel(modelMaude_221);
}
}

static void initStatic__rackwindows()
{
Plugin* const p = new Plugin;
@@ -1154,6 +1217,7 @@ void initStaticPlugins()
initStatic__ImpromptuModular();
initStatic__JW();
initStatic__MindMeld();
initStatic__mscHack();
initStatic__rackwindows();
initStatic__ValleyAudio();
initStatic__ZetaCarinaeModules();


+ 12
- 4
plugins/todo.txt View File

@@ -8,9 +8,6 @@ VultModulesFree 61804.0 (not opensource?)

NYSTHI 58494.0 (not opensource?)

DrumKit 58468.0
https://github.com/SVModular/DrumKit

ML_modules 55847.0
https://github.com/martin-lueders/ML_modules/

@@ -18,16 +15,27 @@ FrozenWasteland 53690.0
https://github.com/almostEric/FrozenWasteland/

ArableInstruments 48756.0
https://github.com/adbrant/ArableInstruments/

squinkylabs-plug1 48682.0
https://github.com/squinkylabs/SquinkyVCV

SonusModular 45245.0
LindenbergResearch 43959.0
https://gitlab.com/sonusdept/sonusmodular

LindenbergResearch 43959.0 (not opensource?)

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

mscHack 42316.0
https://github.com/mschack/VCV-Rack-Plugins/

BaconMusic 42095.0
https://github.com/baconpaul/BaconPlugs/

HetrickCV 42077.0
https://github.com/mhetrick/hetrickcv

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


Loading…
Cancel
Save