brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update a few modules and VCV

Browse source 
Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2021-11-23 20:40:34 +00:00
parent 4c4c3ae135
commit 8df28459a2
No known key found for this signature in database
GPG key ID: CDBAA37ABC74FBA0
13 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -33,7 +33,7 @@
url = https://github.com/bogaudio/BogaudioModules.git url = https://github.com/bogaudio/BogaudioModules.git
[submodule "plugins/Bidoo"] [submodule "plugins/Bidoo"]
path = plugins/Bidoo path = plugins/Bidoo
url = https://github.com/CardinalModules/Bidoo.git url = https://github.com/sebastien-bouffier/Bidoo.git
[submodule "plugins/ESeries"] [submodule "plugins/ESeries"]
path = plugins/ESeries path = plugins/ESeries
url = https://github.com/VCVRack/ESeries.git url = https://github.com/VCVRack/ESeries.git

2
carla

@ -1 +1 @@
Subproject commit 8c9edf7d51e49d36772a5f1814c74251ca41a2a9 Subproject commit 095c25da4a0149cb8e8aed8f2adec5b6bd14eb21

2
dpf

@ -1 +1 @@
Subproject commit 4c62f76915478d7cf6ac89cbc1c9714d1fbeb044 Subproject commit 14423c5eec85b7ef1b5f997a9e27bfc48487c24f

2
plugins/AS

@ -1 +1 @@
Subproject commit d1808328adb71025cf5eb5227105d72905d5279c Subproject commit f2fa0649f59dfba484de23f8c80fdd2b7a1e8c3e

2
plugins/Atelier

@ -1 +1 @@
Subproject commit a72734c8b0b91913e1d16a9d25b8e09a1d12af78 Subproject commit 3861620c3b6788779289254f566336cca2427c0a

2
plugins/Bidoo

@ -1 +1 @@
Subproject commit ba9661fb45b01073645f41fd0d57124c27737c74 Subproject commit d77b971fa28d28270346f4465dfcbc40bd3e5b08

2
plugins/ImpromptuModular

@ -1 +1 @@
Subproject commit 7a0222193e948aa60a310195318fa65d87a772ed Subproject commit e80c8cb0873fbccca2d382d564e69b1a88ecb1f5

5
plugins/ImpromptuModularDark/PanelTheme.cpp
View file

@ -15,6 +15,11 @@ void loadThemeAndContrastFromDefault(int* panelTheme, float* panelContrast) {
} }
bool isDark(int*) {
return true;
}
void createPanelThemeMenu(ui::Menu*, int*, float*, SvgPanel*) {} void createPanelThemeMenu(ui::Menu*, int*, float*, SvgPanel*) {}

10
plugins/Makefile
View file

@ -4,10 +4,6 @@
# Created by falkTX # Created by falkTX
# #
# FIXME items for v2:
# Bidoo includes <system.hpp>, PRIVATE workaround
# ImpromptuModular setNextCableColor
# -------------------------------------------------------------- # --------------------------------------------------------------
# Build config # Build config
@ -350,7 +346,7 @@ PLUGIN_FILES += $(wildcard Bidoo/src/dep/*.cpp)
PLUGIN_FILES += $(wildcard Bidoo/src/dep/filters/*.cpp) PLUGIN_FILES += $(wildcard Bidoo/src/dep/filters/*.cpp)
PLUGIN_FILES += $(wildcard Bidoo/src/dep/freeverb/*.cpp) PLUGIN_FILES += $(wildcard Bidoo/src/dep/freeverb/*.cpp)
PLUGIN_FILES += $(wildcard Bidoo/src/dep/lodepng/*.cpp) PLUGIN_FILES += $(wildcard Bidoo/src/dep/lodepng/*.cpp)
PLUGIN_FILES += $(wildcard Bidoo/src/dep/resampler/*.cpp) PLUGIN_FILES += $(filter-out Bidoo/src/dep/resampler/main.cpp,$(wildcard Bidoo/src/dep/resampler/*.cpp))
# modules/types which are present in other plugins # modules/types which are present in other plugins
BIDOO_CUSTOM = LadderFilter $(DRWAV) BIDOO_CUSTOM = LadderFilter $(DRWAV)
@ -875,7 +871,6 @@ $(BUILD_DIR)/ImpromptuModular/src/Foundr%.cpp.o: ImpromptuModular/src/Foundr%.cp
-DpluginInstance=pluginInstance__ImpromptuModular \ -DpluginInstance=pluginInstance__ImpromptuModular \
-DStepAttributes=StepAttributesKernel \ -DStepAttributes=StepAttributesKernel \
# FIXME -DsetNextCableColor=isComplete shouldn't be here
$(BUILD_DIR)/ImpromptuModular%.cpp.o: ImpromptuModular%.cpp $(BUILD_DIR)/ImpromptuModular%.cpp.o: ImpromptuModular%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@echo "Compiling $<" @echo "Compiling $<"
@ -884,7 +879,7 @@ $(BUILD_DIR)/ImpromptuModular%.cpp.o: ImpromptuModular%.cpp
$(foreach m,$(IMPROMPTUMODULAR_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),ImpromptuModular_$(shell basename $*))) \ $(foreach m,$(IMPROMPTUMODULAR_CUSTOM_PER_FILE),$(call custom_per_file_names,$(m),ImpromptuModular_$(shell basename $*))) \
-DpluginInstance=pluginInstance__ImpromptuModular \ -DpluginInstance=pluginInstance__ImpromptuModular \
-Dinit=init__ImpromptuModular \ -Dinit=init__ImpromptuModular \
-DsetNextCableColor=isComplete -Wno-format-truncation
$(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp
-@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)"
@ -922,6 +917,7 @@ $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp
-DthePlugin=pluginInstance__mscHack \ -DthePlugin=pluginInstance__mscHack \
-Dinit=init__mscHack \ -Dinit=init__mscHack \
-Wno-class-memaccess \ -Wno-class-memaccess \
-Wno-format-overflow \
-Wno-non-c-typedef-for-linkage \ -Wno-non-c-typedef-for-linkage \
-Wno-unused-but-set-variable -Wno-unused-but-set-variable

2
plugins/plugins.cpp
View file

@ -203,6 +203,7 @@ void setupSamples();
/* NOTE too much noise in original include, do this a different way /* NOTE too much noise in original include, do this a different way
// #include "ImpromptuModular/src/ImpromptuModular.hpp" // #include "ImpromptuModular/src/ImpromptuModular.hpp"
*/ */
extern Model *modelAdaptiveQuantizer;
extern Model *modelBigButtonSeq; extern Model *modelBigButtonSeq;
extern Model *modelBigButtonSeq2; extern Model *modelBigButtonSeq2;
extern Model *modelChordKey; extern Model *modelChordKey;
@ -1002,6 +1003,7 @@ static void initStatic__ImpromptuModular()
const StaticPluginLoader spl(p, "ImpromptuModular"); const StaticPluginLoader spl(p, "ImpromptuModular");
if (spl.ok()) if (spl.ok())
{ {
p->addModel(modelAdaptiveQuantizer);
p->addModel(modelBigButtonSeq); p->addModel(modelBigButtonSeq);
p->addModel(modelBigButtonSeq2); p->addModel(modelBigButtonSeq2);
p->addModel(modelChordKey); p->addModel(modelChordKey);

20
src/CardinalPlugin.cpp
View file

@ -578,7 +578,7 @@ protected:
parameter.symbol = "param_"; parameter.symbol = "param_";
parameter.symbol += String(index + 1); parameter.symbol += String(index + 1);
parameter.unit = "v"; parameter.unit = "v";
parameter.hints = kParameterIsAutomable; parameter.hints = kParameterIsAutomatable;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 10.0f; parameter.ranges.max = 10.0f;
@ -590,7 +590,7 @@ protected:
case kWindowParameterShowTooltips: case kWindowParameterShowTooltips:
parameter.name = "Show tooltips"; parameter.name = "Show tooltips";
parameter.symbol = "tooltips"; parameter.symbol = "tooltips";
parameter.hints = kParameterIsAutomable|kParameterIsInteger|kParameterIsBoolean; parameter.hints = kParameterIsAutomatable|kParameterIsInteger|kParameterIsBoolean;
parameter.ranges.def = 1.0f; parameter.ranges.def = 1.0f;
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f; parameter.ranges.max = 1.0f;
@ -599,7 +599,7 @@ protected:
parameter.name = "Cable opacity"; parameter.name = "Cable opacity";
parameter.symbol = "cableOpacity"; parameter.symbol = "cableOpacity";
parameter.unit = "%"; parameter.unit = "%";
parameter.hints = kParameterIsAutomable; parameter.hints = kParameterIsAutomatable;
parameter.ranges.def = 50.0f; parameter.ranges.def = 50.0f;
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 100.0f; parameter.ranges.max = 100.0f;
@ -608,7 +608,7 @@ protected:
parameter.name = "Cable tension"; parameter.name = "Cable tension";
parameter.symbol = "cableTension"; parameter.symbol = "cableTension";
parameter.unit = "%"; parameter.unit = "%";
parameter.hints = kParameterIsAutomable; parameter.hints = kParameterIsAutomatable;
parameter.ranges.def = 50.0f; parameter.ranges.def = 50.0f;
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 100.0f; parameter.ranges.max = 100.0f;
@ -617,7 +617,7 @@ protected:
parameter.name = "Room brightness"; parameter.name = "Room brightness";
parameter.symbol = "rackBrightness"; parameter.symbol = "rackBrightness";
parameter.unit = "%"; parameter.unit = "%";
parameter.hints = kParameterIsAutomable; parameter.hints = kParameterIsAutomatable;
parameter.ranges.def = 100.0f; parameter.ranges.def = 100.0f;
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 100.0f; parameter.ranges.max = 100.0f;
@ -626,7 +626,7 @@ protected:
parameter.name = "Light Bloom"; parameter.name = "Light Bloom";
parameter.symbol = "haloBrightness"; parameter.symbol = "haloBrightness";
parameter.unit = "%"; parameter.unit = "%";
parameter.hints = kParameterIsAutomable; parameter.hints = kParameterIsAutomatable;
parameter.ranges.def = 25.0f; parameter.ranges.def = 25.0f;
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 100.0f; parameter.ranges.max = 100.0f;
@ -634,7 +634,7 @@ protected:
case kWindowParameterKnobMode: case kWindowParameterKnobMode:
parameter.name = "Knob mode"; parameter.name = "Knob mode";
parameter.symbol = "knobMode"; parameter.symbol = "knobMode";
parameter.hints = kParameterIsAutomable|kParameterIsInteger; parameter.hints = kParameterIsAutomatable|kParameterIsInteger;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 2.0f; parameter.ranges.max = 2.0f;
@ -651,7 +651,7 @@ protected:
case kWindowParameterWheelKnobControl: case kWindowParameterWheelKnobControl:
parameter.name = "Scroll wheel knob control"; parameter.name = "Scroll wheel knob control";
parameter.symbol = "knobScroll"; parameter.symbol = "knobScroll";
parameter.hints = kParameterIsAutomable|kParameterIsInteger|kParameterIsBoolean; parameter.hints = kParameterIsAutomatable|kParameterIsInteger|kParameterIsBoolean;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f; parameter.ranges.max = 1.0f;
@ -659,7 +659,7 @@ protected:
case kWindowParameterWheelSensitivity: case kWindowParameterWheelSensitivity:
parameter.name = "Scroll wheel knob sensitivity"; parameter.name = "Scroll wheel knob sensitivity";
parameter.symbol = "knobScrollSensitivity"; parameter.symbol = "knobScrollSensitivity";
parameter.hints = kParameterIsAutomable|kParameterIsLogarithmic; parameter.hints = kParameterIsAutomatable|kParameterIsLogarithmic;
parameter.ranges.def = 1.0f; parameter.ranges.def = 1.0f;
parameter.ranges.min = 0.1f; parameter.ranges.min = 0.1f;
parameter.ranges.max = 10.0f; parameter.ranges.max = 10.0f;
@ -667,7 +667,7 @@ protected:
case kWindowParameterLockModulePositions: case kWindowParameterLockModulePositions:
parameter.name = "Lock module positions"; parameter.name = "Lock module positions";
parameter.symbol = "lockModules"; parameter.symbol = "lockModules";
parameter.hints = kParameterIsAutomable|kParameterIsInteger|kParameterIsBoolean; parameter.hints = kParameterIsAutomatable|kParameterIsInteger|kParameterIsBoolean;
parameter.ranges.def = 0.0f; parameter.ranges.def = 0.0f;
parameter.ranges.min = 0.0f; parameter.ranges.min = 0.0f;
parameter.ranges.max = 1.0f; parameter.ranges.max = 1.0f;

2
src/Rack

@ -1 +1 @@
Subproject commit 588342d73b4c6a2909b00a262da64b2565e844a5 Subproject commit 05fa24a72bccf4023f5fb1b0fa7f1c26855c0926

1
src/override/MenuBar.cpp
View file

@ -37,7 +37,6 @@
#include <ui/SequentialLayout.hpp> #include <ui/SequentialLayout.hpp>
#include <ui/Slider.hpp> #include <ui/Slider.hpp>
#include <ui/TextField.hpp> #include <ui/TextField.hpp>
#include <ui/PasswordField.hpp>
#include <ui/ProgressBar.hpp> #include <ui/ProgressBar.hpp>
#include <ui/Label.hpp> #include <ui/Label.hpp>
#include <engine/Engine.hpp> #include <engine/Engine.hpp>