diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 455397b..c1dd648 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,7 +3,7 @@ name: build on: [push, pull_request] env: - CACHE_VERSION: 14 + CACHE_VERSION: 15 CARDINAL_UNDER_WINE: 1 CIBUILD: true DEBIAN_FRONTEND: noninteractive diff --git a/deps/PawPaw b/deps/PawPaw index f6eaed1..dd0fd45 160000 --- a/deps/PawPaw +++ b/deps/PawPaw @@ -1 +1 @@ -Subproject commit f6eaed13bdeccec013d81ba2261f98aa8f452702 +Subproject commit dd0fd459be75110d76b633e606a1a1dbc607b2ab diff --git a/docs/CARDINAL-MODULES.md b/docs/CARDINAL-MODULES.md index 26124c6..cfc231e 100644 --- a/docs/CARDINAL-MODULES.md +++ b/docs/CARDINAL-MODULES.md @@ -185,6 +185,17 @@ Unlike Rack, Cardinal does not use PPQN (pulses per quarter note) values, but BB The top of the panel has a timer display to help understand how and what the host is doing. The first line is the song time in seconds, and second line is the BBT. +The meaning of the outputs is: + +- Playing: On if the host transport is rolling or Off if paused/stopped +- Reset: Trigger for when the host transport has been relocated or has been restarted +- Bar: Trigger for bar change +- Beat: Trigger for beat change +- Step: Trigger for step change +- Bar Phase: 0-10v smooth ramp for the bar position (with bar division being a right-click option) +- Beat Phase: 0-10v smooth ramp for the beat position +- BPM: Volts per Beat per Second, as supported by Impromptu Clocked/Clkd and ZZC Clock + ## Extra modules ### Blank diff --git a/docs/Module_HostTime.png b/docs/Module_HostTime.png index d58dff9..b79d396 100644 Binary files a/docs/Module_HostTime.png and b/docs/Module_HostTime.png differ diff --git a/dpf b/dpf index d4c2ce6..d38701a 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit d4c2ce6e3da43ae328876146b60d2d2cca5caa44 +Subproject commit d38701abff789f44f2f483a6360416a9adbcc8f9 diff --git a/plugins/Makefile b/plugins/Makefile index 3560229..68c1558 100644 --- a/plugins/Makefile +++ b/plugins/Makefile @@ -1846,7 +1846,7 @@ LV2_RESOURCES += $(PLUGIN_LIST:%=../bin/CardinalFX.lv2/resources/PluginManifests LV2_RESOURCES += $(RESOURCE_FILES:%=../bin/Cardinal.lv2/resources/%) LV2_RESOURCES += $(RESOURCE_FILES:%=../bin/CardinalFX.lv2/resources/%) -# MOD builds only have LV2 FX variant for now +# wasm builds only have standalone and mini else ifeq ($(WASM),true) MINI_RESOURCES = $(MINIPLUGIN_LIST:%=../bin/CardinalMini.lv2/resources/PluginManifests/%.json) diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 1041a0c..561b32c 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -294,7 +294,9 @@ endif ifeq ($(WASM),true) +ifneq ($(DEBUG),true) LINK_FLAGS += -O3 +endif LINK_FLAGS += -sALLOW_MEMORY_GROWTH LINK_FLAGS += -sINITIAL_MEMORY=64Mb LINK_FLAGS += -sLZ4=1 @@ -337,7 +339,12 @@ SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/fx_presets SYMLINKED_DIRS_RESOURCES += surgext/build/surge-data/wavetables SYMLINKED_DIRS_RESOURCES += WSTD-Drums/res/samples endif + +ifeq ($(CARDINAL_VARIANT),mini) +LINK_FLAGS += $(foreach d,$(SYMLINKED_DIRS_RESOURCES),--preload-file=../../bin/CardinalMini.lv2/resources/$(d)@/resources/$(d)) +else LINK_FLAGS += $(foreach d,$(SYMLINKED_DIRS_RESOURCES),--preload-file=../../bin/CardinalNative.lv2/resources/$(d)@/resources/$(d)) +endif else ifeq ($(HAIKU),true)