Merge branch 'main' into jsfx

Makefile

@@ -22,7 +22,7 @@ else
 MODULEDIR := $(CURDIR)/build/modules/Release
 endif
 
-VERSION   := 2.4.0
+VERSION   := 2.4.1
 
 -include Makefile.user.mk
 
@@ -38,9 +38,8 @@ ALL_LIBS += $(MODULEDIR)/carla_engine.a
 endif
 ALL_LIBS += $(MODULEDIR)/carla_engine_plugin.a
 ALL_LIBS += $(MODULEDIR)/carla_plugin.a
-ifneq ($(STATIC_PLUGIN_TARGET),true)
 ALL_LIBS += $(MODULEDIR)/jackbridge.a
-else
+ifeq ($(STATIC_PLUGIN_TARGET),true)
 ALL_LIBS += $(MODULEDIR)/jackbridge.min.a
 endif
 ALL_LIBS += $(MODULEDIR)/native-plugins.a
@@ -114,7 +113,7 @@ $(MODULEDIR)/carla_plugin.a: .FORCE
 $(MODULEDIR)/jackbridge.a: .FORCE
 	@$(MAKE) -C source/jackbridge
 
-$(MODULEDIR)/jackbridge.%.a: .FORCE
+$(MODULEDIR)/jackbridge.%.a: $(MODULEDIR)/jackbridge.a
 	@$(MAKE) -C source/jackbridge $*
 
 $(MODULEDIR)/native-plugins.a: .FORCE

source/Makefile.deps.mk

@@ -509,6 +509,7 @@ WATER_LIBS       = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleau
 ifeq ($(USING_JUCE),true)
 JUCE_AUDIO_DEVICES_LIBS    = -lwinmm -lole32
 JUCE_CORE_LIBS             = -luuid -lwsock32 -lwininet -lversion -lole32 -lws2_32 -loleaut32 -limm32 -lcomdlg32 -lshlwapi -lrpcrt4 -lwinmm
+JUCE_EVENTS_LIBS           = -lole32
 JUCE_GRAPHICS_LIBS         = -lgdi32
 JUCE_GUI_BASICS_LIBS       = -lgdi32 -limm32 -lcomdlg32 -lole32
 endif # USING_JUCE

source/frontend/carla_shared.py

@@ -71,7 +71,7 @@ if WINDOWS:
 # ------------------------------------------------------------------------------------------------------------
 # Set Version
 
-VERSION = "2.4.0"
+VERSION = "2.4.1"
 
 # ------------------------------------------------------------------------------------------------------------
 # Set TMP
@@ -359,6 +359,7 @@ if WINDOWS:
     splitter = ";"
 
     APPDATA = os.getenv("APPDATA")
+    LOCALAPPDATA = os.getenv("LOCALAPPDATA", APPDATA)
     PROGRAMFILES = os.getenv("PROGRAMFILES")
     PROGRAMFILESx86 = os.getenv("PROGRAMFILES(x86)")
     COMMONPROGRAMFILES = os.getenv("COMMONPROGRAMFILES")
@@ -396,6 +397,7 @@ if WINDOWS:
         DEFAULT_VST2_PATH  += ";" + COMMONPROGRAMFILES + "\\VST2"
 
     DEFAULT_VST3_PATH    = COMMONPROGRAMFILES + "\\VST3"
+    DEFAULT_VST3_PATH   += ";" + LOCALAPPDATA + "\\Programs\\Common\\VST3"
 
     DEFAULT_SF2_PATH     = APPDATA + "\\SF2"
     DEFAULT_SFZ_PATH     = APPDATA + "\\SFZ"

source/frontend/patchcanvas/scene.py

@@ -81,6 +81,7 @@ class PatchScene(QGraphicsScene):
         self.m_cursor_cut = None
         self.m_cursor_zoom = None
 
+        self.setItemIndexMethod(QGraphicsScene.ItemIndexMethod.NoIndex)
         self.selectionChanged.connect(self.slot_selectionChanged)
 
     def getDevicePixelRatioF(self):

source/includes/CarlaDefines.h

@@ -32,8 +32,8 @@
 #endif
 
 /* Set Version */
-#define CARLA_VERSION_HEX    0x020400
-#define CARLA_VERSION_STRING "2.4.0"
+#define CARLA_VERSION_HEX    0x020401
+#define CARLA_VERSION_STRING "2.4.1"
 #define CARLA_VERSION_STRMIN "2.4"
 
 /* Check OS */
@@ -270,7 +270,7 @@ private:                                        \
 #endif
 
 /* Define CARLA_API */
-#ifdef BUILD_BRIDGE
+#if defined(BUILD_BRIDGE) || defined(STATIC_PLUGIN_TARGET)
 # define CARLA_API
 #else
 # if defined(CARLA_OS_WIN) && ! defined(__WINE__)

source/modules/water/streams/MemoryOutputStream.cpp

@@ -30,7 +30,8 @@ namespace water {
 
 MemoryOutputStream::MemoryOutputStream (const size_t initialSize)
   : internalBlock(), blockToUse (internalBlock),
-    position (0), size (0)
+    position (0), size (0),
+    usingInternalBlock (true)
 {
     internalBlock.setSize (initialSize, false);
 }
@@ -38,7 +39,8 @@ MemoryOutputStream::MemoryOutputStream (const size_t initialSize)
 MemoryOutputStream::MemoryOutputStream (MemoryBlock& memoryBlockToWriteTo,
                                         const bool appendToExistingBlockContent)
   : internalBlock(), blockToUse (memoryBlockToWriteTo),
-    position (0), size (0)
+    position (0), size (0),
+    usingInternalBlock (false)
 {
     if (appendToExistingBlockContent)
         position = size = memoryBlockToWriteTo.getSize();
@@ -56,7 +58,7 @@ void MemoryOutputStream::flush()
 
 void MemoryOutputStream::trimExternalBlockSize()
 {
-    if (blockToUse != internalBlock)
+    if (! usingInternalBlock)
         blockToUse.setSize (size, false);
 }
 

source/modules/water/streams/MemoryOutputStream.h

@@ -123,6 +123,7 @@ private:
     MemoryBlock internalBlock;
     MemoryBlock& blockToUse;
     size_t position, size;
+    bool usingInternalBlock;
 
     void trimExternalBlockSize();
     char* prepareToWrite (size_t);