Browse Source

Revert "Merge branch 'main' into update-enigmacurry2"

This reverts commit c2de3c4b439af7360806320895b909673edf37ce, reversing
changes made to 927b3cc77a.
pull/739/head
rl2939 1 year ago
parent
commit
f73bfd51bb
8 changed files with 0 additions and 128 deletions
  1. +0
    -10
      .gitmodules
  2. +0
    -3
      README.md
  3. +0
    -3
      docs/LICENSES.md
  4. +0
    -1
      plugins/AlliewayAudio_Freebies
  5. +0
    -42
      plugins/Makefile
  6. +0
    -1
      plugins/SynthKit
  7. +0
    -1
      plugins/eightfold
  8. +0
    -67
      plugins/plugins.cpp

+ 0
- 10
.gitmodules View File

@@ -260,13 +260,3 @@
[submodule "plugins/admiral"]
path = plugins/admiral
url = https://github.com/wapiflapi/admiral.git
[submodule "plugins/AlliewayAudio_Freebies"]
path = plugins/AlliewayAudio_Freebies
url = https://github.com/AlliewayAudio/AlliewayAudio_Freebies.git
[submodule "plugins/eightfold"]
path = plugins/eightfold
url = https://github.com/scanner-darkly/eightfold.git
[submodule "plugins/SynthKit"]
path = plugins/SynthKit
url = https://github.com/SVModular/SynthKit.git

+ 0
- 3
README.md View File

@@ -125,7 +125,6 @@ At the moment the following 3rd-party modules are provided:
- [Admiral](https://github.com/wapiflapi/admiral)
- [alef's bits](https://github.com/alefnull/alefsbits)
- [AlgoritmArte](https://github.com/algoritmarte/AlgoritmarteVCVPlugin)
- [AlliewayAudio_Freebies](https://github.com/AlliewayAudio/AlliewayAudio_Freebies)
- [Amalgamated Harmonics](https://github.com/jhoar/AmalgamatedHarmonics)
- [Animated Circuits](https://github.com/AnimatedCircuits/RackModules)
- [Arable Instruments](https://github.com/adbrant/ArableInstruments)
@@ -147,7 +146,6 @@ At the moment the following 3rd-party modules are provided:
- [dBiz](https://github.com/dBiz/dBiz)
- [DHE Modules](https://github.com/dhemery/DHE-Modules)
- [DrumKit](https://svmodular.com/plugin/vcv/drumkit.html)
- [eightfold](https://github.com/scanner-darkly/eightfold)
- [EnigmaCurry](https://github.com/EnigmaCurry/EnigmaCurry-vcv-pack)
- [E-Series](https://github.com/VCVRack/ESeries)
- [ExpertSleepers Encoders](https://expert-sleepers.co.uk/vcvrack_encoders.html)
@@ -196,7 +194,6 @@ At the moment the following 3rd-party modules are provided:
- [Starling Via](https://github.com/starlingcode/Via-for-Rack)
- [Stoermelder Pack-One](https://github.com/stoermelder/vcvrack-packone)
- [Surge XT](https://github.com/surge-synthesizer/surge-rack)
- [SynthKit](https://github.com/SVModular/SynthKit)
- [unless_modules](https://gitlab.com/unlessgames/unless_modules)
- [Valley](https://github.com/ValleyAudio/ValleyRackFree)
- [Voxglitch](https://github.com/clone45/voxglitch)


+ 0
- 3
docs/LICENSES.md View File

@@ -19,7 +19,6 @@ Below follows a list of all code licenses used in Cardinal and linked submodules
| admiral | MIT | |
| alef's bits | GPL-3.0-or-later | |
| AlgoritmArte | GPL-3.0-or-later | |
| AlliewayAudio_Freebies | GPL-3.0-or-later | |
| Amalgamated Harmonics | BSD-3-Clause | |
| Animated Circuits | GPL-3.0-or-later | |
| Arable Instruments | GPL-3.0-or-later | |
@@ -41,7 +40,6 @@ Below follows a list of all code licenses used in Cardinal and linked submodules
| dBiz | GPL-3.0-or-later | |
| DHE-Modules | MIT | |
| DrumKit | CC0-1.0 | |
| eightfold | GPL-3.0-or-later | |
| EnigmaCurry | GPL-3.0-or-later | |
| E-Series | GPL-3.0-or-later | |
| ExpertSleepers Encoders | MIT | |
@@ -90,7 +88,6 @@ Below follows a list of all code licenses used in Cardinal and linked submodules
| stocaudio | GPL-3.0-or-later | |
| Stoermelder Pack-One | GPL-3.0-or-later | |
| Surge XT | GPL-3.0-or-later | |
| SynthKit | CC0-1.0 | |
| unless_modules | GPL-3.0-or-later | |
| Valley | GPL-3.0-or-later | |
| Voxglitch | GPL-3.0-or-later | |


+ 0
- 1
plugins/AlliewayAudio_Freebies

@@ -1 +0,0 @@
Subproject commit 4052a08e222fb6a8e795a6192bb78079a85cc864

+ 0
- 42
plugins/Makefile View File

@@ -338,13 +338,6 @@ ALEFSBITS_CUSTOM = Steps Logic

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

# --------------------------------------------------------------
# AlliewayAudio_Freebies

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

ALLIEWAYAUDIO_FREEBIES_CUSTOM = DCBlocker

# --------------------------------------------------------------
# Aaron Static

@@ -709,13 +702,6 @@ PLUGIN_FILES += $(wildcard DrumKit/deps/SynthDevKit/src/*.cpp)
# modules/types which are present in other plugins
DRUMKIT_CUSTOM = ADSR Envelope LowFrequencyOscillator

# --------------------------------------------------------------
# eightfold

PLUGIN_FILES += $(filter-out eightfold/src/plugin.cpp,$(wildcard eightfold/src/*.cpp))
# modules/types which are present in other plugins
EIGHTFOLD_CUSTOM = Comparator comparator

# --------------------------------------------------------------
# EnigmaCurry

@@ -1185,13 +1171,6 @@ MINIPLUGIN_FILES += surgext/src/XTModuleWidget.cpp
MINIPLUGIN_FILES += surgext/src/XTStyle.cpp
MINIPLUGIN_FILES += surgext-helper/surgext-helper.cpp

# --------------------------------------------------------------
# SynthKit

PLUGIN_FILES += $(filter-out SynthKit/src/SynthKit.cpp,$(wildcard SynthKit/src/*.cpp))
PLUGIN_FILES += $(wildcard SynthKit/src/controller/*.cpp)
PLUGIN_FILES += $(wildcard SynthKit/src/view/*.cpp)

# --------------------------------------------------------------
# unless_modules

@@ -2176,13 +2155,6 @@ $(BUILD_DIR)/Algoritmarte/%.cpp.o: Algoritmarte/%.cpp
$(foreach m,$(ALGORITMARTE_CUSTOM),$(call custom_module_names,$(m),Algoritmarte)) \
-DpluginInstance=pluginInstance__Algoritmarte

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

$(BUILD_DIR)/AmalgamatedHarmonics/%.cpp.o: AmalgamatedHarmonics/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
@@ -2380,13 +2352,6 @@ $(BUILD_DIR)/DrumKit/%.cpp.o: DrumKit/%.cpp
-Dinit=init__DrumKit \
-Wno-sign-compare

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

$(BUILD_DIR)/EnigmaCurry/src/%.cpp.o: EnigmaCurry/src/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<"
@@ -2831,13 +2796,6 @@ $(BUILD_DIR)/surgext%.cpp.o: surgext%.cpp
$(foreach m,$(SURGEXT_CUSTOM),$(call custom_module_names,$(m),surgext)) \
-DpluginInstance=pluginInstance__surgext

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

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


+ 0
- 1
plugins/SynthKit

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

+ 0
- 1
plugins/eightfold

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

+ 0
- 67
plugins/plugins.cpp View File

@@ -46,9 +46,6 @@ extern Model* modelDivisions;
// Algoritmarte
#include "Algoritmarte/src/plugin.hpp"

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

// AmalgamatedHarmonics
#include "AmalgamatedHarmonics/src/AH.hpp"

@@ -398,9 +395,6 @@ namespace xycloid { void init(Plugin*); }
#include "DrumKit/src/DrumKit.hpp"
void setupSamples();

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

// EnigmaCurry
#define modelPulse modelEnigmaCurryPulse
#include "EnigmaCurry/src/plugin.hpp"
@@ -874,9 +868,6 @@ void StoermelderSettings::readFromJson() {}
void surgext_rack_initialize();
void surgext_rack_update_theme();

// SynthKit
#include "SynthKit/src/SynthKit.hpp"

// unless_modules
#include "unless_modules/src/unless.hpp"

@@ -928,7 +919,6 @@ extern Plugin* pluginInstance__AaronStatic;
Plugin* pluginInstance__admiral;
Plugin* pluginInstance__alefsbits;
Plugin* pluginInstance__Algoritmarte;
Plugin* pluginInstance__AlliewayAudio_Freebies;
Plugin* pluginInstance__AmalgamatedHarmonics;
Plugin* pluginInstance__ArableInstruments;
Plugin* pluginInstance__AnimatedCircuits;
@@ -950,7 +940,6 @@ Plugin* pluginInstance__CVfunk;
Plugin* pluginInstance__dBiz;
Plugin* pluginInstance__DHE;
extern Plugin* pluginInstance__DrumKit;
Plugin* pluginInstance__eightfold;
Plugin* pluginInstance__EnigmaCurry;
Plugin* pluginInstance__ESeries;
Plugin* pluginInstance__ExpertSleepersEncoders;
@@ -998,7 +987,6 @@ Plugin* pluginInstance__StarlingVia;
Plugin* pluginInstance__stocaudio;
extern Plugin* pluginInstance__stoermelder_p1;
Plugin* pluginInstance__surgext;
Plugin* pluginInstance__SynthKit;
Plugin* pluginInstance__unless_modules;
Plugin* pluginInstance__ValleyAudio;
Plugin* pluginInstance__Voxglitch;
@@ -1327,18 +1315,6 @@ static void initStatic__Algoritmarte()
}
}

static void initStatic__AlliewayAudio_Freebies()
{
Plugin* const p = new Plugin;
pluginInstance__AlliewayAudio_Freebies = p;

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

static void initStatic__AmalgamatedHarmonics()
{
Plugin* const p = new Plugin;
@@ -2150,22 +2126,6 @@ static void initStatic__DrumKit()
}
}

static void initStatic__eightfold()
{
Plugin* const p = new Plugin;
pluginInstance__eightfold = p;

const StaticPluginLoader spl(p, "eightfold");
if (spl.ok())
{
p->addModel(modelSDOrcasHeartV2);
p->addModel(modelSDFormation);
p->addModel(modelSDLines);
p->addModel(modelSDTransgate);
p->addModel(modelSDComparator);
}
}

static void initStatic__EnigmaCurry()
{
Plugin* const p = new Plugin;
@@ -3396,30 +3356,6 @@ static void initStatic__surgext()
}
}

static void initStatic__SynthKit()
{
Plugin* const p = new Plugin;
pluginInstance__SynthKit = p;

const StaticPluginLoader spl(p, "SynthKit");
if (spl.ok())
{
p->addModel(modelAddition);
p->addModel(modelSubtraction);
p->addModel(modelAnd);
p->addModel(modelOr);
p->addModel(modelM1x8);
p->addModel(modelM1x8CV);
p->addModel(modelClockDivider);
p->addModel(modelRotatingClockDivider);
p->addModel(modelRotatingClockDivider2);
p->addModel(modelPrimeClockDivider);
p->addModel(modelFibonacciClockDivider);
p->addModel(modelSeq4);
p->addModel(modelSeq8);
}
}

static void initStatic__unless_modules()
{
Plugin* const p = new Plugin;
@@ -3568,7 +3504,6 @@ void initStaticPlugins()
initStatic__admiral();
initStatic__alefsbits();
initStatic__Algoritmarte();
initStatic__AlliewayAudio_Freebies();
initStatic__AmalgamatedHarmonics();
initStatic__AnimatedCircuits();
initStatic__ArableInstruments();
@@ -3590,7 +3525,6 @@ void initStaticPlugins()
initStatic__dBiz();
initStatic__DHE();
initStatic__DrumKit();
initStatic__eightfold();
initStatic__EnigmaCurry();
initStatic__ESeries();
initStatic__ExpertSleepersEncoders();
@@ -3638,7 +3572,6 @@ void initStaticPlugins()
initStatic__stocaudio();
initStatic__stoermelder_p1();
initStatic__surgext();
initStatic__SynthKit();
initStatic__unless_modules();
initStatic__ValleyAudio();
initStatic__Voxglitch();


Loading…
Cancel
Save