From b0dd82f1f6b8dc3420f446a3ec8c47acfc3c5321 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 17 Apr 2014 21:14:14 +0000 Subject: [PATCH] fix win32 bridges --- source/backend/plugin/BridgePlugin.cpp | 2 +- source/utils/CarlaRingBuffer.hpp | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/source/backend/plugin/BridgePlugin.cpp b/source/backend/plugin/BridgePlugin.cpp index 3afcb8a39..6f9f87aa4 100644 --- a/source/backend/plugin/BridgePlugin.cpp +++ b/source/backend/plugin/BridgePlugin.cpp @@ -1908,7 +1908,7 @@ public: carla_stdout(" sizeof(BridgeTimeInfo): " P_SIZE, sizeof(BridgeTimeInfo)); // lock memory - fShmControl.lockMemory(); + //fShmControl.lockMemory(); // initial values fShmControl.writeOpcode(kPluginBridgeOpcodeNull); diff --git a/source/utils/CarlaRingBuffer.hpp b/source/utils/CarlaRingBuffer.hpp index 85e4f6f46..30a58f195 100644 --- a/source/utils/CarlaRingBuffer.hpp +++ b/source/utils/CarlaRingBuffer.hpp @@ -294,15 +294,18 @@ private: static void memoryBarrier() noexcept { + // this breaks win32<=>linux plugin bridges +#if 0 try { #if defined(CARLA_OS_MAC) - ::OSMemoryBarrier(); + ::OSMemoryBarrier(); #elif defined(CARLA_OS_WIN) ::MemoryBarrier(); #elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 401 ::__sync_synchronize(); #endif } CARLA_SAFE_EXCEPTION("RingBufferControl::memoryBarrier"); +#endif } CARLA_PREVENT_HEAP_ALLOCATION