Skip to content

Commit 84ef94e

Browse files
dromerdromer
committed
alphabetize
1 parent ca35a64 commit 84ef94e

6 files changed

Lines changed: 70 additions & 71 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ At the moment the following 3rd-party modules are provided:
145145
- [CVfunk](https://github.com/codygeary/CVfunk-Modules)
146146
- [dBiz](https://github.com/dBiz/dBiz)
147147
- [DHE Modules](https://github.com/dhemery/DHE-Modules)
148-
- [WSTD-Drums](https://github.com/Wasted-Audio/WSTD-Drums)
149148
- [eightfold](https://github.com/scanner-darkly/eightfold)
150149
- [EnigmaCurry](https://github.com/EnigmaCurry/EnigmaCurry-vcv-pack)
151150
- [E-Series](https://github.com/VCVRack/ESeries)
@@ -199,6 +198,7 @@ At the moment the following 3rd-party modules are provided:
199198
- [Valley](https://github.com/ValleyAudio/ValleyRackFree)
200199
- [Voxglitch](https://github.com/clone45/voxglitch)
201200
- [WhatTheRack](https://github.com/korfuri/WhatTheRack)
201+
- [WSTD-Drums](https://github.com/Wasted-Audio/WSTD-Drums)
202202
- [ZetaCarinae](https://github.com/mhampton/ZetaCarinaeModules)
203203
- [ZZC](https://github.com/zezic/ZZC)
204204

‎plugins/Makefile‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -694,19 +694,6 @@ DBIZ_CUSTOM_PER_FILE = LERP MultiFilter Oscillator calcOutput sineOsc subBank
694694

695695
PLUGIN_FILES += $(filter-out DHE-Modules/src/plugin.cpp,$(wildcard DHE-Modules/src/modules/*/init.cpp))
696696

697-
# --------------------------------------------------------------
698-
# WSTD-Drums
699-
700-
PLUGIN_FILES += $(wildcard WSTD-Drums/src/*.cpp)
701-
PLUGIN_FILES += $(wildcard WSTD-Drums/src/controller/*.cpp)
702-
PLUGIN_FILES += $(wildcard WSTD-Drums/src/view/*.cpp)
703-
PLUGIN_FILES += $(wildcard WSTD-Drums/src/model/*.cpp)
704-
PLUGIN_FILES += $(wildcard WSTD-Drums/deps/*.cpp)
705-
PLUGIN_FILES += $(wildcard WSTD-Drums/deps/SynthDevKit/src/*.cpp)
706-
707-
# modules/types which are present in other plugins
708-
WSTD_DRUMS_CUSTOM = ADSR Envelope LowFrequencyOscillator
709-
710697
# --------------------------------------------------------------
711698
# eightfold
712699

@@ -1338,6 +1325,19 @@ VOXGLITCH_CUSTOM_PER_FILE = AudioBuffer GateSequencer Grain SamplePlayer Sequenc
13381325

13391326
PLUGIN_FILES += $(filter-out WhatTheRack/src/WhatTheRack.cpp,$(wildcard WhatTheRack/src/*.cpp))
13401327

1328+
# --------------------------------------------------------------
1329+
# WSTD-Drums
1330+
1331+
PLUGIN_FILES += $(wildcard WSTD-Drums/src/*.cpp)
1332+
PLUGIN_FILES += $(wildcard WSTD-Drums/src/controller/*.cpp)
1333+
PLUGIN_FILES += $(wildcard WSTD-Drums/src/view/*.cpp)
1334+
PLUGIN_FILES += $(wildcard WSTD-Drums/src/model/*.cpp)
1335+
PLUGIN_FILES += $(wildcard WSTD-Drums/deps/*.cpp)
1336+
PLUGIN_FILES += $(wildcard WSTD-Drums/deps/SynthDevKit/src/*.cpp)
1337+
1338+
# modules/types which are present in other plugins
1339+
WSTD_DRUMS_CUSTOM = ADSR Envelope LowFrequencyOscillator
1340+
13411341
# --------------------------------------------------------------
13421342
# ZetaCarinaeModules
13431343

@@ -2350,15 +2350,6 @@ $(BUILD_DIR)/DHE-Modules/src/%.cpp.o: DHE-Modules/src/%.cpp
23502350
-DpluginInstance=pluginInstance__DHE \
23512351
-IDHE-Modules/src
23522352

2353-
$(BUILD_DIR)/WSTD-Drums/%.cpp.o: WSTD-Drums/%.cpp
2354-
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
2355-
@echo "Compiling $<"
2356-
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
2357-
$(foreach m,$(WSTD_DRUMS_CUSTOM),$(call custom_module_names,$(m),WSTD_Drums)) \
2358-
-DpluginInstance=pluginInstance__WSTD_Drums \
2359-
-Dinit=init__WSTD_Drums \
2360-
-Wno-sign-compare
2361-
23622353
$(BUILD_DIR)/eightfold/src/%.cpp.o: eightfold/src/%.cpp
23632354
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
23642355
@echo "Compiling $<"
@@ -2846,6 +2837,15 @@ $(BUILD_DIR)/WhatTheRack/%.cpp.o: WhatTheRack/%.cpp
28462837
$(foreach m,$(WHATTHERACK_CUSTOM),$(call custom_module_names,$(m),WhatTheRack)) \
28472838
-DpluginInstance=pluginInstance__WhatTheRack
28482839

2840+
$(BUILD_DIR)/WSTD-Drums/%.cpp.o: WSTD-Drums/%.cpp
2841+
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
2842+
@echo "Compiling $<"
2843+
$(SILENT)$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@ \
2844+
$(foreach m,$(WSTD_DRUMS_CUSTOM),$(call custom_module_names,$(m),WSTD_Drums)) \
2845+
-DpluginInstance=pluginInstance__WSTD_Drums \
2846+
-Dinit=init__WSTD_Drums \
2847+
-Wno-sign-compare
2848+
28492849
$(BUILD_DIR)/ZamAudio/%.cpp.o: ZamAudio/%.cpp
28502850
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
28512851
@echo "Compiling $<"

‎plugins/plugins.cpp‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -395,10 +395,6 @@ namespace truth { void init(Plugin*); }
395395
namespace xycloid { void init(Plugin*); }
396396
}
397397

398-
// WSTD-Drums
399-
#include "WSTD-Drums/src/WSTD_Drums.hpp"
400-
void setupSamples();
401-
402398
// eightfold
403399
#include "eightfold/src/plugin.hpp"
404400

@@ -900,6 +896,10 @@ void surgext_rack_update_theme();
900896
// WhatTheRack
901897
#include "WhatTheRack/src/WhatTheRack.hpp"
902898

899+
// WSTD-Drums
900+
#include "WSTD-Drums/src/WSTD_Drums.hpp"
901+
void setupSamples();
902+
903903
// ZetaCarinaeModules
904904
#include "ZetaCarinaeModules/src/plugin.hpp"
905905

@@ -957,7 +957,6 @@ Plugin* pluginInstance__Computerscare;
957957
Plugin* pluginInstance__CVfunk;
958958
Plugin* pluginInstance__dBiz;
959959
Plugin* pluginInstance__DHE;
960-
extern Plugin* pluginInstance__WSTD_Drums;
961960
Plugin* pluginInstance__eightfold;
962961
Plugin* pluginInstance__EnigmaCurry;
963962
Plugin* pluginInstance__ESeries;
@@ -1010,6 +1009,7 @@ Plugin* pluginInstance__unless_modules;
10101009
Plugin* pluginInstance__ValleyAudio;
10111010
Plugin* pluginInstance__Voxglitch;
10121011
Plugin* pluginInstance__WhatTheRack;
1012+
extern Plugin* pluginInstance__WSTD_Drums;
10131013
Plugin* pluginInstance__ZetaCarinaeModules;
10141014
Plugin* pluginInstance__ZZC;
10151015

@@ -2147,30 +2147,6 @@ static void initStatic__DHE()
21472147
}
21482148
}
21492149

2150-
static void initStatic__WSTD_Drums()
2151-
{
2152-
Plugin* const p = new Plugin;
2153-
pluginInstance__WSTD_Drums = p;
2154-
2155-
const StaticPluginLoader spl(p, "WSTD-Drums");
2156-
if (spl.ok())
2157-
{
2158-
setupSamples();
2159-
p->addModel(modelBD9);
2160-
p->addModel(modelSnare);
2161-
p->addModel(modelClosedHH);
2162-
p->addModel(modelOpenHH);
2163-
p->addModel(modelDMX);
2164-
p->addModel(modelCR78);
2165-
p->addModel(modelSBD);
2166-
p->addModel(modelGnome);
2167-
p->addModel(modelSequencer);
2168-
p->addModel(modelTomi);
2169-
p->addModel(modelBaronial);
2170-
p->addModel(modelMarionette);
2171-
}
2172-
}
2173-
21742150
static void initStatic__eightfold()
21752151
{
21762152
Plugin* const p = new Plugin;
@@ -3537,6 +3513,30 @@ static void initStatic__WhatTheRack()
35373513
}
35383514
}
35393515

3516+
static void initStatic__WSTD_Drums()
3517+
{
3518+
Plugin* const p = new Plugin;
3519+
pluginInstance__WSTD_Drums = p;
3520+
3521+
const StaticPluginLoader spl(p, "WSTD-Drums");
3522+
if (spl.ok())
3523+
{
3524+
setupSamples();
3525+
p->addModel(modelBD9);
3526+
p->addModel(modelSnare);
3527+
p->addModel(modelClosedHH);
3528+
p->addModel(modelOpenHH);
3529+
p->addModel(modelDMX);
3530+
p->addModel(modelCR78);
3531+
p->addModel(modelSBD);
3532+
p->addModel(modelGnome);
3533+
p->addModel(modelSequencer);
3534+
p->addModel(modelTomi);
3535+
p->addModel(modelBaronial);
3536+
p->addModel(modelMarionette);
3537+
}
3538+
}
3539+
35403540
static void initStatic__ZetaCarinaeModules()
35413541
{
35423542
Plugin* p = new Plugin;
@@ -3609,7 +3609,6 @@ void initStaticPlugins()
36093609
initStatic__CVfunk();
36103610
initStatic__dBiz();
36113611
initStatic__DHE();
3612-
initStatic__WSTD_Drums();
36133612
initStatic__eightfold();
36143613
initStatic__EnigmaCurry();
36153614
initStatic__ESeries();
@@ -3662,6 +3661,7 @@ void initStaticPlugins()
36623661
initStatic__ValleyAudio();
36633662
initStatic__Voxglitch();
36643663
initStatic__WhatTheRack();
3664+
initStatic__WSTD_Drums();
36653665
initStatic__ZetaCarinaeModules();
36663666
initStatic__ZZC();
36673667

‎src/CardinalRemote/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/chopin
229229
SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/debussy
230230
SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/goldberg
231231
SYMLINKED_DIRS_RESOURCES += cf/playeroscs
232-
SYMLINKED_DIRS_RESOURCES += WSTD-Drums/res/samples
233232
SYMLINKED_DIRS_RESOURCES += Fundamental/presets
234233
SYMLINKED_DIRS_RESOURCES += GrandeModular/presets
235234
SYMLINKED_DIRS_RESOURCES += LyraeModules/presets
@@ -247,6 +246,7 @@ SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/fx_presets
247246
SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/wavetables
248247
SYMLINKED_DIRS_RESOURCES += surgext/patches
249248
SYMLINKED_DIRS_RESOURCES += surgext/presets
249+
SYMLINKED_DIRS_RESOURCES += WSTD-Drums/res/samples
250250
LINK_FLAGS += $(foreach d,$(SYMLINKED_DIRS_RESOURCES),--preload-file=../../bin/CardinalNative.lv2/resources/$(d)@/resources/$(d))
251251
endif
252252
LINK_FLAGS += -sALLOW_MEMORY_GROWTH

‎src/Makefile.cardinal.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,6 @@ SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/debussy
317317
SYMLINKED_DIRS_RESOURCES += BaconPlugs/res/midi/goldberg
318318
SYMLINKED_DIRS_RESOURCES += cf/playeroscs
319319
SYMLINKED_DIRS_RESOURCES += DHE-Modules/svg
320-
SYMLINKED_DIRS_RESOURCES += WSTD-Drums/res/samples
321320
SYMLINKED_DIRS_RESOURCES += GrandeModular/presets
322321
SYMLINKED_DIRS_RESOURCES += LyraeModules/presets
323322
SYMLINKED_DIRS_RESOURCES += Meander/res
@@ -332,6 +331,7 @@ SYMLINKED_DIRS_RESOURCES += Orbits/presets
332331
SYMLINKED_DIRS_RESOURCES += stoermelder-packone/presets
333332
SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/fx_presets
334333
SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/wavetables
334+
SYMLINKED_DIRS_RESOURCES += WSTD-Drums/res/samples
335335
endif
336336
LINK_FLAGS += $(foreach d,$(SYMLINKED_DIRS_RESOURCES),--preload-file=../../bin/CardinalNative.lv2/resources/$(d)@/resources/$(d))
337337

‎src/custom/dep.cpp‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ enum LightMode {
346346
kModeBefaco,
347347
kModeCardinal,
348348
kModeComputerscareLight,
349-
kModeWSTDDrums,
350349
kModeExtratone,
351350
kModeFehlerFabrik,
352351
kModeForsitan,
@@ -360,6 +359,7 @@ enum LightMode {
360359
kModePrism,
361360
kModeRepelzen,
362361
kModeSonusmodular,
362+
kModeWSTDDrums,
363363
};
364364

365365
static const struct {
@@ -443,21 +443,6 @@ static const struct {
443443
{ kModeCardinal, "/Cardinal/res/HostParamsMap.svg" },
444444
{ kModeCardinal, "/Cardinal/res/HostTime.svg" },
445445
{ kModeCardinal, "/Cardinal/res/Ildaeil.svg" },
446-
// CC0-1.0
447-
{ kModeWSTDDrums, "/WSTD-Drums/res/Baronial.svg" },
448-
{ kModeWSTDDrums, "/WSTD-Drums/res/BD9.svg" },
449-
{ kModeWSTDDrums, "/WSTD-Drums/res/ClosedHH.svg" },
450-
{ kModeWSTDDrums, "/WSTD-Drums/res/CR78.svg" },
451-
{ kModeWSTDDrums, "/WSTD-Drums/res/DMX.svg" },
452-
{ kModeWSTDDrums, "/WSTD-Drums/res/Gnome.svg" },
453-
{ kModeWSTDDrums, "/WSTD-Drums/res/Marionette.svg" },
454-
{ kModeWSTDDrums, "/WSTD-Drums/res/OpenHH.svg" },
455-
{ kModeWSTDDrums, "/WSTD-Drums/res/SBD.svg" },
456-
{ kModeWSTDDrums, "/WSTD-Drums/res/Sequencer.svg" },
457-
{ kModeWSTDDrums, "/WSTD-Drums/res/Snare.svg" },
458-
{ kModeWSTDDrums, "/WSTD-Drums/res/Tomi.svg" },
459-
{ kModeWSTDDrums, "/WSTD-Drums/res/component/Knob.svg" },
460-
461446
// BSD-3 Clause
462447
{ kModeComputerscareLight, "/Computerscare/res/ComputerscareStolyFickPigurePanel.svg" },
463448
// GPLv3+
@@ -595,6 +580,20 @@ static const struct {
595580
{ kModeSonusmodular, "/sonusmodular/res/tropicana.svg" },
596581
{ kModeSonusmodular, "/sonusmodular/res/twoff.svg" },
597582
{ kModeSonusmodular, "/sonusmodular/res/yabp.svg" },
583+
// CC0-1.0
584+
{ kModeWSTDDrums, "/WSTD-Drums/res/Baronial.svg" },
585+
{ kModeWSTDDrums, "/WSTD-Drums/res/BD9.svg" },
586+
{ kModeWSTDDrums, "/WSTD-Drums/res/ClosedHH.svg" },
587+
{ kModeWSTDDrums, "/WSTD-Drums/res/CR78.svg" },
588+
{ kModeWSTDDrums, "/WSTD-Drums/res/DMX.svg" },
589+
{ kModeWSTDDrums, "/WSTD-Drums/res/Gnome.svg" },
590+
{ kModeWSTDDrums, "/WSTD-Drums/res/Marionette.svg" },
591+
{ kModeWSTDDrums, "/WSTD-Drums/res/OpenHH.svg" },
592+
{ kModeWSTDDrums, "/WSTD-Drums/res/SBD.svg" },
593+
{ kModeWSTDDrums, "/WSTD-Drums/res/Sequencer.svg" },
594+
{ kModeWSTDDrums, "/WSTD-Drums/res/Snare.svg" },
595+
{ kModeWSTDDrums, "/WSTD-Drums/res/Tomi.svg" },
596+
{ kModeWSTDDrums, "/WSTD-Drums/res/component/Knob.svg" },
598597
};
599598

600599
static inline

0 commit comments

Comments
 (0)