diff --git a/.gitmodules b/.gitmodules index e0eefa6..231703f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,7 +33,7 @@ url = https://github.com/bogaudio/BogaudioModules.git [submodule "plugins/Bidoo"] path = plugins/Bidoo - url = https://github.com/CardinalModules/Bidoo.git + url = https://github.com/sebastien-bouffier/Bidoo.git [submodule "plugins/ESeries"] path = plugins/ESeries url = https://github.com/VCVRack/ESeries.git diff --git a/carla b/carla index 8c9edf7..095c25d 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit 8c9edf7d51e49d36772a5f1814c74251ca41a2a9 +Subproject commit 095c25da4a0149cb8e8aed8f2adec5b6bd14eb21 diff --git a/dpf b/dpf index 4c62f76..14423c5 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 4c62f76915478d7cf6ac89cbc1c9714d1fbeb044 +Subproject commit 14423c5eec85b7ef1b5f997a9e27bfc48487c24f diff --git a/plugins/AS b/plugins/AS index d180832..f2fa064 160000 --- a/plugins/AS +++ b/plugins/AS @@ -1 +1 @@ -Subproject commit d1808328adb71025cf5eb5227105d72905d5279c +Subproject commit f2fa0649f59dfba484de23f8c80fdd2b7a1e8c3e diff --git a/plugins/Atelier b/plugins/Atelier index a72734c..3861620 160000 --- a/plugins/Atelier +++ b/plugins/Atelier @@ -1 +1 @@ -Subproject commit a72734c8b0b91913e1d16a9d25b8e09a1d12af78 +Subproject commit 3861620c3b6788779289254f566336cca2427c0a diff --git a/plugins/Bidoo b/plugins/Bidoo index ba9661f..d77b971 160000 --- a/plugins/Bidoo +++ b/plugins/Bidoo @@ -1 +1 @@ -Subproject commit ba9661fb45b01073645f41fd0d57124c27737c74 +Subproject commit d77b971fa28d28270346f4465dfcbc40bd3e5b08 diff --git a/plugins/ImpromptuModular b/plugins/ImpromptuModular index 7a02221..e80c8cb 160000 --- a/plugins/ImpromptuModular +++ b/plugins/ImpromptuModular @@ -1 +1 @@ -Subproject commit 7a0222193e948aa60a310195318fa65d87a772ed +Subproject commit e80c8cb0873fbccca2d382d564e69b1a88ecb1f5 diff --git a/plugins/ImpromptuModularDark/PanelTheme.cpp b/plugins/ImpromptuModularDark/PanelTheme.cpp index 27e6e44..7603552 100644 --- a/plugins/ImpromptuModularDark/PanelTheme.cpp +++ b/plugins/ImpromptuModularDark/PanelTheme.cpp @@ -15,6 +15,11 @@ void loadThemeAndContrastFromDefault(int* panelTheme, float* panelContrast) { } +bool isDark(int*) { + return true; +} + + void createPanelThemeMenu(ui::Menu*, int*, float*, SvgPanel*) {} @@ -51,6 +56,6 @@ void InverterWidget::draw(const DrawArgs& args) { nvgFill(args.vg); nvgClosePath(args.vg); // nvgRestore(args.vg); - } + } } diff --git a/plugins/Makefile b/plugins/Makefile index 6e06169..5b254db 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -4,10 +4,6 @@ # Created by falkTX # -# FIXME items for v2: -# Bidoo includes , PRIVATE workaround -# ImpromptuModular setNextCableColor - # -------------------------------------------------------------- # 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/freeverb/*.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 BIDOO_CUSTOM = LadderFilter $(DRWAV) @@ -875,7 +871,6 @@ $(BUILD_DIR)/ImpromptuModular/src/Foundr%.cpp.o: ImpromptuModular/src/Foundr%.cp -DpluginInstance=pluginInstance__ImpromptuModular \ -DStepAttributes=StepAttributesKernel \ -# FIXME -DsetNextCableColor=isComplete shouldn't be here $(BUILD_DIR)/ImpromptuModular%.cpp.o: ImpromptuModular%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @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 $*))) \ -DpluginInstance=pluginInstance__ImpromptuModular \ -Dinit=init__ImpromptuModular \ - -DsetNextCableColor=isComplete + -Wno-format-truncation $(BUILD_DIR)/JW-Modules/%.cpp.o: JW-Modules/%.cpp -@mkdir -p "$(shell dirname $(BUILD_DIR)/$<)" @@ -922,6 +917,7 @@ $(BUILD_DIR)/mscHack/%.cpp.o: mscHack/%.cpp -DthePlugin=pluginInstance__mscHack \ -Dinit=init__mscHack \ -Wno-class-memaccess \ + -Wno-format-overflow \ -Wno-non-c-typedef-for-linkage \ -Wno-unused-but-set-variable diff --git a/plugins/plugins.cpp b/plugins/plugins.cpp index e93b9d4..9535376 100644 --- a/plugins/plugins.cpp +++ b/plugins/plugins.cpp @@ -203,6 +203,7 @@ void setupSamples(); /* NOTE too much noise in original include, do this a different way // #include "ImpromptuModular/src/ImpromptuModular.hpp" */ +extern Model *modelAdaptiveQuantizer; extern Model *modelBigButtonSeq; extern Model *modelBigButtonSeq2; extern Model *modelChordKey; @@ -1002,6 +1003,7 @@ static void initStatic__ImpromptuModular() const StaticPluginLoader spl(p, "ImpromptuModular"); if (spl.ok()) { + p->addModel(modelAdaptiveQuantizer); p->addModel(modelBigButtonSeq); p->addModel(modelBigButtonSeq2); p->addModel(modelChordKey); diff --git a/src/CardinalPlugin.cpp b/src/CardinalPlugin.cpp index ae2cb33..9cba13f 100644 --- a/src/CardinalPlugin.cpp +++ b/src/CardinalPlugin.cpp @@ -578,7 +578,7 @@ protected: parameter.symbol = "param_"; parameter.symbol += String(index + 1); parameter.unit = "v"; - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.ranges.def = 0.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 10.0f; @@ -590,7 +590,7 @@ protected: case kWindowParameterShowTooltips: parameter.name = "Show tooltips"; parameter.symbol = "tooltips"; - parameter.hints = kParameterIsAutomable|kParameterIsInteger|kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable|kParameterIsInteger|kParameterIsBoolean; parameter.ranges.def = 1.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 1.0f; @@ -599,7 +599,7 @@ protected: parameter.name = "Cable opacity"; parameter.symbol = "cableOpacity"; parameter.unit = "%"; - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.ranges.def = 50.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 100.0f; @@ -608,7 +608,7 @@ protected: parameter.name = "Cable tension"; parameter.symbol = "cableTension"; parameter.unit = "%"; - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.ranges.def = 50.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 100.0f; @@ -617,7 +617,7 @@ protected: parameter.name = "Room brightness"; parameter.symbol = "rackBrightness"; parameter.unit = "%"; - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.ranges.def = 100.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 100.0f; @@ -626,7 +626,7 @@ protected: parameter.name = "Light Bloom"; parameter.symbol = "haloBrightness"; parameter.unit = "%"; - parameter.hints = kParameterIsAutomable; + parameter.hints = kParameterIsAutomatable; parameter.ranges.def = 25.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 100.0f; @@ -634,7 +634,7 @@ protected: case kWindowParameterKnobMode: parameter.name = "Knob mode"; parameter.symbol = "knobMode"; - parameter.hints = kParameterIsAutomable|kParameterIsInteger; + parameter.hints = kParameterIsAutomatable|kParameterIsInteger; parameter.ranges.def = 0.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 2.0f; @@ -651,7 +651,7 @@ protected: case kWindowParameterWheelKnobControl: parameter.name = "Scroll wheel knob control"; parameter.symbol = "knobScroll"; - parameter.hints = kParameterIsAutomable|kParameterIsInteger|kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable|kParameterIsInteger|kParameterIsBoolean; parameter.ranges.def = 0.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 1.0f; @@ -659,7 +659,7 @@ protected: case kWindowParameterWheelSensitivity: parameter.name = "Scroll wheel knob sensitivity"; parameter.symbol = "knobScrollSensitivity"; - parameter.hints = kParameterIsAutomable|kParameterIsLogarithmic; + parameter.hints = kParameterIsAutomatable|kParameterIsLogarithmic; parameter.ranges.def = 1.0f; parameter.ranges.min = 0.1f; parameter.ranges.max = 10.0f; @@ -667,7 +667,7 @@ protected: case kWindowParameterLockModulePositions: parameter.name = "Lock module positions"; parameter.symbol = "lockModules"; - parameter.hints = kParameterIsAutomable|kParameterIsInteger|kParameterIsBoolean; + parameter.hints = kParameterIsAutomatable|kParameterIsInteger|kParameterIsBoolean; parameter.ranges.def = 0.0f; parameter.ranges.min = 0.0f; parameter.ranges.max = 1.0f; diff --git a/src/Rack b/src/Rack index 588342d..05fa24a 160000 --- a/src/Rack +++ b/src/Rack @@ -1 +1 @@ -Subproject commit 588342d73b4c6a2909b00a262da64b2565e844a5 +Subproject commit 05fa24a72bccf4023f5fb1b0fa7f1c26855c0926 diff --git a/src/override/MenuBar.cpp b/src/override/MenuBar.cpp index e59a4e6..fcbff1c 100644 --- a/src/override/MenuBar.cpp +++ b/src/override/MenuBar.cpp @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include