merge conflict

.gitignore

@@ -5,15 +5,22 @@
 *.exe
 *.dll
 *.dylib
+*.pkg
 *.so
 *.zip
 
 .DS_Store
 .kdev_include_paths
 .kdev4/
 
-bin/
-build/
-documentation.pdf
-utils/inno/resources.iss
-utils/inno/version.iss
+.cache
+compile_commands.json
+
+/bin/
+/build/
+/documentation.pdf
+/jucewrapper/build/
+/jucewrapper/JUCE/
+/src/CardinalNative/resources/
+/utils/inno/resources.iss
+/utils/inno/version.iss

.gitmodules

@@ -193,6 +193,22 @@
 [submodule "plugins/PinkTrombone"]
 	path = plugins/PinkTrombone
 	url = https://github.com/VegaDeftwing/PinkTromboneVCV.git
+[submodule "plugins/Meander"]
+	path = plugins/Meander
+	url = https://github.com/knchaffin/Meander.git
+	branch = master-V2
+[submodule "plugins/WhatTheRack"]
+	path = plugins/WhatTheRack
+	url = https://github.com/korfuri/WhatTheRack.git
+[submodule "plugins/AS"]
+	path = plugins/AS
+	url = https://github.com/AScustomWorks/AS.git
+[submodule "plugins/forsitan-modulare"]
+	path = plugins/forsitan-modulare
+	url = https://github.com/gosub/forsitan-modulare.git
+[submodule "plugins/myth-modules"]
+	path = plugins/myth-modules
+	url = https://github.com/Ahineya/vcv-myth-plugin.git
 [submodule "plugins/StarlingVia"]
 	path = plugins/StarlingVia
 	url = https://github.com/starlingcode/Via-for-Rack.git

Makefile

@@ -5,14 +5,14 @@
 #
 
 # also set in:
+# jucewrapper/CMakeList.txt `project`
 # src/CardinalCommon.cpp `CARDINAL_VERSION`
 # src/CardinalPlugin.cpp `getVersion`
-VERSION = 22.04
+VERSION = 22.09
 
 # --------------------------------------------------------------
 # Import base definitions
 
-USE_NANOVG_FBO = true
 include dpf/Makefile.base.mk
 
 # --------------------------------------------------------------
@@ -43,7 +43,9 @@ endif
 # --------------------------------------------------------------
 # Carla config
 
-CARLA_EXTRA_ARGS = CARLA_BACKEND_NAMESPACE=Cardinal \
+CARLA_EXTRA_ARGS = \
+	CARLA_BACKEND_NAMESPACE=Cardinal \
+	DGL_NAMESPACE=CardinalDGL \
 	HAVE_FFMPEG=false \
 	HAVE_FLUIDSYNTH=false \
 	HAVE_PROJECTM=false \
@@ -54,20 +56,19 @@ ifneq ($(DEBUG),true)
 CARLA_EXTRA_ARGS += EXTERNAL_PLUGINS=true
 endif
 
-CARLA_EXTRA_ARGS += USING_JUCE=false
-CARLA_EXTRA_ARGS += USING_JUCE_GUI_EXTRA=false
-
 # --------------------------------------------------------------
 # DGL config
 
 DGL_EXTRA_ARGS = \
+	DISTRHO_NAMESPACE=CardinalDISTRHO \
+	DGL_NAMESPACE=CardinalDGL \
 	NVG_DISABLE_SKIPPING_WHITESPACE=true \
 	NVG_FONT_TEXTURE_FLAGS=NVG_IMAGE_NEAREST \
 	USE_NANOVG_FBO=true \
 	WINDOWS_ICON_ID=401
 
 # --------------------------------------------------------------
-# Check for system-wide dependencies
+# Check for required system-wide dependencies
 
 ifeq ($(SYSDEPS),true)
 
@@ -97,8 +98,7 @@ endif
 # --------------------------------------------------------------
 # Check for X11+OpenGL dependencies (unless headless build)
 
-ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
-ifneq ($(WASM),true)
+ifneq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS),true)
 ifneq ($(HEADLESS),true)
 
 ifneq ($(HAVE_OPENGL),true)
@@ -107,6 +107,9 @@ endif
 ifneq ($(HAVE_X11),true)
 $(error X11 dependency not installed/available)
 endif
+ifneq ($(HAVE_XCURSOR),true)
+$(warning Xcursor dependency not installed/available)
+endif
 ifneq ($(HAVE_XEXT),true)
 $(warning Xext dependency not installed/available)
 endif
@@ -118,11 +121,20 @@ else
 
 CARLA_EXTRA_ARGS += HAVE_OPENGL=false
 CARLA_EXTRA_ARGS += HAVE_X11=false
+CARLA_EXTRA_ARGS += HAVE_XCURSOR=false
 CARLA_EXTRA_ARGS += HAVE_XEXT=false
 CARLA_EXTRA_ARGS += HAVE_XRANDR=false
 
 endif
 endif
+
+# --------------------------------------------------------------
+# Check for optional system-wide dependencies
+
+ifeq ($(shell $(PKG_CONFIG) --exists fftw3f && echo true),true)
+HAVE_FFTW3F = true
+else
+$(warning fftw3f dependency not installed/available)
 endif
 
 # --------------------------------------------------------------
@@ -186,14 +198,16 @@ endif
 # --------------------------------------------------------------
 # Individual targets
 
-cardinal: carla deps dgl plugins
+cardinal: carla deps dgl plugins resources
 	$(MAKE) all -C src $(CARLA_EXTRA_ARGS)
 
 carla:
 ifneq ($(STATIC_BUILD),true)
 	$(MAKE) static-plugin -C carla $(CARLA_EXTRA_ARGS) \
 		CAN_GENERATE_LV2_TTL=false \
-		STATIC_PLUGIN_TARGET=true
+		CUSTOM_DPF_PATH=$(CURDIR)/dpf \
+		STATIC_PLUGIN_TARGET=true \
+		USING_CUSTOM_DPF=true
 endif
 
 deps:
@@ -202,6 +216,9 @@ ifeq ($(SYSDEPS),true)
 else
 	$(MAKE) all -C deps
 endif
+ifeq ($(HAVE_FFTW3F),true)
+	$(MAKE) all -C deps/aubio
+endif
 
 dgl:
 ifneq ($(HEADLESS),true)
@@ -211,7 +228,7 @@ endif
 plugins: deps
 	$(MAKE) all -C plugins
 
-resources: cardinal
+resources:
 	$(MAKE) resources -C plugins
 
 ifneq ($(CROSS_COMPILING),true)
@@ -227,16 +244,24 @@ endif
 # --------------------------------------------------------------
 # Packaging standalone for CI
 
-unzipfx: deps/unzipfx/unzipfx2cat$(APP_EXT) Cardinal.zip
-	cat deps/unzipfx/unzipfx2cat$(APP_EXT) Cardinal.zip > Cardinal
-	chmod +x Cardinal
-
-Cardinal.zip: bin/Cardinal bin/CardinalFX.lv2/resources
-	mkdir -p build/unzipfx
-	ln -sf ../../bin/Cardinal build/unzipfx/Cardinal
-	ln -s ../../bin/CardinalFX.lv2/resources build/unzipfx/resources
-	cd build/unzipfx && \
-		zip -r -9 ../../Cardinal.zip Cardinal resources
+unzipfx: deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalJACK.zip CardinalNative.zip
+	cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalJACK.zip > CardinalJACK
+	cat deps/unzipfx/unzipfx2cat$(APP_EXT) CardinalNative.zip > CardinalNative
+	chmod +x CardinalJACK CardinalNative
+
+CardinalJACK.zip: bin/Cardinal bin/CardinalFX.lv2/resources
+	mkdir -p build/unzipfx-jack
+	ln -sf ../../bin/Cardinal build/unzipfx-jack/Cardinal
+	ln -s ../../bin/CardinalFX.lv2/resources build/unzipfx-jack/resources
+	cd build/unzipfx-jack && \
+		zip -r -9 ../../$@ Cardinal resources
+
+CardinalNative.zip: bin/CardinalNative bin/CardinalFX.lv2/resources
+	mkdir -p build/unzipfx-native
+	ln -sf ../../bin/CardinalNative build/unzipfx-native/Cardinal
+	ln -s ../../bin/CardinalFX.lv2/resources build/unzipfx-native/resources
+	cd build/unzipfx-native && \
+		zip -r -9 ../../$@ Cardinal resources
 
 deps/unzipfx/unzipfx2cat:
 	make -C deps/unzipfx -f Makefile.linux
@@ -250,6 +275,7 @@ deps/unzipfx/unzipfx2cat.exe:
 clean:
 	$(MAKE) distclean -C carla $(CARLA_EXTRA_ARGS) CAN_GENERATE_LV2_TTL=false STATIC_PLUGIN_TARGET=true
 	$(MAKE) clean -C deps
+	$(MAKE) clean -C deps/aubio
 	$(MAKE) clean -C dpf/dgl
 	$(MAKE) clean -C dpf/utils/lv2-ttl-generator
 	$(MAKE) clean -C plugins
@@ -312,7 +338,6 @@ TAR_ARGS = \
 	--exclude=build \
 	--exclude=jucewrapper \
 	--exclude=lv2export \
-	--exclude=patches \
 	--exclude=carla/data \
 	--exclude=carla/source/frontend \
 	--exclude=carla/source/interposer \

README.md

@@ -1,4 +1,4 @@
-<!-- # DISTRHO Cardinal -->
+# DISTRHO Cardinal
 
 *Cardinal, the Rack!*
 
@@ -19,16 +19,12 @@ All "Core" modules from Rack have been replaced by Cardinal equivalents, simplif
 Cardinal does not load external modules and does not connect to the official Rack library/store.  
 All VCV branding has been removed (to the best of our knowledge) in order to avoid any trademark issues.
 
-The VST3 version is in progress, already part of the build but still experimental.
-
 
 ## Current status
 
-With the exception of a few bugs, Cardinal can be considered stable.  
-Though currently the following should be noted:
+Cardinal should be considered stable, if you spot any bugs please report them.  
+Currently the following should be noted:
 
-- Keyboard input does not always work in some hosts [#24](https://github.com/DISTRHO/Cardinal/issues/24)
-- VST3 support incomplete/experimental [#41](https://github.com/DISTRHO/Cardinal/issues/41)
 - Windows 32bit builds do not work well [#80](https://github.com/DISTRHO/Cardinal/issues/80)
 
 ### Stable release
@@ -86,10 +82,6 @@ Plugin type is set as regular "effect".
 Because people will ask for it. It is, well... Rack.  
 But a couple of modules background's have their colors flipped, because damn we want proper dark mode!
 
-### Init / Default patch
-
-![screenshot](docs/Screenshot_Init-Patch.png "Screenshot")
-
 ### Module browser
 
 ![screenshot](docs/Screenshot_Module-Browser.png "Screenshot")
@@ -102,6 +94,10 @@ But a couple of modules background's have their colors flipped, because damn we
 
 ![screenshot](docs/Screenshot_Carla+Ildaeil.png "Screenshot")
 
+### Custom Fundamental modules design
+
+![screenshot](docs/Screenshot_Fundamental.png "Screenshot")
+
 
 ## Included modules
 
@@ -115,6 +111,7 @@ At the moment the following 3rd-party modules are provided:
 - Animated Circuits
 - Arable Instruments
 - Aria Salvatrice
+- AS
 - Audible Instruments
 - Autinn
 - Axioma
@@ -130,6 +127,7 @@ At the moment the following 3rd-party modules are provided:
 - ExpertSleepers Encoders
 - Extratone
 - Fehler Fabrik
+- forsitan modulare
 - Fundamental
 - Glue the Giant
 - GoodSheperd
@@ -145,12 +143,14 @@ At the moment the following 3rd-party modules are provided:
 - Little Utils
 - Lomas Modules
 - Lyrae Modules
+- Meander
 - MindMeld
 - ML Modules
 - Mockba Modular
 - Mog
 - mscHack
 - MSM
+- Myth
 - Nonlinear Circuits
 - Orbits
 - Parable Instruments
@@ -165,10 +165,11 @@ At the moment the following 3rd-party modules are provided:
 - unless_modules
 - Valley
 - Voxglitch
+- WhatTheRack
 - ZetaCarinae
 - ZZC
 
-Additionally Cardinal provides its own modules for DAW/Host automation, time position and internal plugin hosting.
+Additionally Cardinal provides its own modules for DAW/Host automation, time position, audio to CV pitch conversion and internal plugin hosting.
 
 ### Adding modules