Browse Source

Merge branch 'DISTRHO:main' into update-surge

pull/807/head
rl2939 GitHub 2 weeks ago
parent
commit
39262e99a9
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
7 changed files with 22 additions and 4 deletions
  1. +1
    -1
      .github/workflows/build.yml
  2. +1
    -1
      deps/PawPaw
  3. +11
    -0
      docs/CARDINAL-MODULES.md
  4. BIN
      docs/Module_HostTime.png
  5. +1
    -1
      dpf
  6. +1
    -1
      plugins/Makefile
  7. +7
    -0
      src/Makefile.cardinal.mk

+ 1
- 1
.github/workflows/build.yml View File

@@ -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


+ 1
- 1
deps/PawPaw

@@ -1 +1 @@
Subproject commit f6eaed13bdeccec013d81ba2261f98aa8f452702
Subproject commit dd0fd459be75110d76b633e606a1a1dbc607b2ab

+ 11
- 0
docs/CARDINAL-MODULES.md View File

@@ -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


BIN
docs/Module_HostTime.png View File

Before After
Width: 320  |  Height: 760  |  Size: 77KB Width: 320  |  Height: 760  |  Size: 74KB

+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit d4c2ce6e3da43ae328876146b60d2d2cca5caa44
Subproject commit d38701abff789f44f2f483a6360416a9adbcc8f9

+ 1
- 1
plugins/Makefile View File

@@ -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)


+ 7
- 0
src/Makefile.cardinal.mk View File

@@ -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)



Loading…
Cancel
Save