#define NO_PARAMS_MUTEX -> PARAMS_MUTEX

iPlug2 · Dec 14, 2018 · f9a185f · f9a185f
1 parent a616641
commit f9a185f
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 19 deletions.
diff --git a/Documentation/macros.md b/Documentation/macros.md
@@ -12,7 +12,7 @@ IPlug uses preprocessor macros to select certain APIs and functionality at compi
 * WAM_API
 * USE_IDLE_CALLS: if this is enabled as a preprocessor macro IPlug::OnIdle() will be called in VST2 plug-ins
 * IPLUG1_COMPATIBILITY: if you're upgrading an existing product, you should define this so that compatibility is maintained with your existing state
-* NO_PARAMS_MUTEX: don't lock a mutex when accessing mParams
+* PARAMS_MUTEX: lock a mutex when accessing mParams
 
 ##IGraphics
 * GRAPHICS_SCALING: enables hi DPI graphics

diff --git a/Examples/IPlugControls/config/IPlugControls-ios.xcconfig b/Examples/IPlugControls/config/IPlugControls-ios.xcconfig
@@ -15,7 +15,7 @@ EXTRA_LNK_FLAGS = $(IGRAPHICS_LNK_FLAGS)
 //------------------------------
 // PREPROCESSOR MACROS
 
-EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugControls SWELL_APP_PREFIX=Swell_vIPlugControls GRAPHICS_SCALING NO_PARAMS_MUTEX IGRAPHICS_NANOVG IGRAPHICS_METAL
+EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugControls SWELL_APP_PREFIX=Swell_vIPlugControls IGRAPHICS_NANOVG IGRAPHICS_METAL
 //EXTRA_DEBUG_DEFS =
 //EXTRA_RELEASE_DEFS =
 //EXTRA_TRACER_DEFS =

diff --git a/Examples/IPlugControls/config/IPlugControls-mac.xcconfig b/Examples/IPlugControls/config/IPlugControls-mac.xcconfig
@@ -18,7 +18,7 @@ EXTRA_PLUGIN_DEFS = //SWELL_NO_POSTMESSAGE
 //------------------------------
 // PREPROCESSOR MACROS
 
-EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugControls SWELL_APP_PREFIX=Swell_vIPlugControls IGRAPHICS_NANOVG IGRAPHICS_METAL NO_PARAMS_MUTEX
+EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugControls SWELL_APP_PREFIX=Swell_vIPlugControls IGRAPHICS_NANOVG IGRAPHICS_METAL
 //EXTRA_DEBUG_DEFS =
 //EXTRA_RELEASE_DEFS =
 //EXTRA_TRACER_DEFS =

diff --git a/Examples/IPlugEffect/config/IPlugEffect-ios.xcconfig b/Examples/IPlugEffect/config/IPlugEffect-ios.xcconfig
@@ -15,7 +15,7 @@ EXTRA_LNK_FLAGS = $(IGRAPHICS_LNK_FLAGS)
 //------------------------------
 // PREPROCESSOR MACROS
 
-EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugEffect SWELL_APP_PREFIX=Swell_vIPlugEffect GRAPHICS_SCALING NO_PARAMS_MUTEX IGRAPHICS_NANOVG IGRAPHICS_METAL
+EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugEffect SWELL_APP_PREFIX=Swell_vIPlugEffect IGRAPHICS_NANOVG IGRAPHICS_METAL
 //EXTRA_DEBUG_DEFS =
 //EXTRA_RELEASE_DEFS =
 //EXTRA_TRACER_DEFS =

diff --git a/Examples/IPlugEffect/config/IPlugEffect-mac.xcconfig b/Examples/IPlugEffect/config/IPlugEffect-mac.xcconfig
@@ -18,7 +18,7 @@ EXTRA_PLUGIN_DEFS = //SWELL_NO_POSTMESSAGE
 //------------------------------
 // PREPROCESSOR MACROS
 
-EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugEffect SWELL_APP_PREFIX=Swell_vIPlugEffect IGRAPHICS_NANOVG IGRAPHICS_GL2 NO_PARAMS_MUTEX
+EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugEffect SWELL_APP_PREFIX=Swell_vIPlugEffect IGRAPHICS_NANOVG IGRAPHICS_GL2
 //EXTRA_DEBUG_DEFS =
 //EXTRA_RELEASE_DEFS =
 //EXTRA_TRACER_DEFS =

diff --git a/Examples/IPlugFaustDSP/config/IPlugFaustDSP-ios.xcconfig b/Examples/IPlugFaustDSP/config/IPlugFaustDSP-ios.xcconfig
@@ -15,7 +15,7 @@ EXTRA_LNK_FLAGS = $(IGRAPHICS_LNK_FLAGS)
 //------------------------------
 // PREPROCESSOR MACROS
 
-EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugFaustDSP SWELL_APP_PREFIX=Swell_vIPlugFaustDSP GRAPHICS_SCALING NO_PARAMS_MUTEX IGRAPHICS_NANOVG IGRAPHICS_METAL
+EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugFaustDSP SWELL_APP_PREFIX=Swell_vIPlugFaustDSP IGRAPHICS_NANOVG IGRAPHICS_METAL
 //EXTRA_DEBUG_DEFS =
 //EXTRA_RELEASE_DEFS =
 //EXTRA_TRACER_DEFS =

diff --git a/Examples/IPlugFaustDSP/config/IPlugFaustDSP-mac.xcconfig b/Examples/IPlugFaustDSP/config/IPlugFaustDSP-mac.xcconfig
@@ -18,7 +18,7 @@ EXTRA_LNK_FLAGS = $(IGRAPHICS_LNK_FLAGS) $(FAUST_LNK_FLAGS)//$(LIB_CIVET)
 //------------------------------
 // PREPROCESSOR MACROS
 
-EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugFaustDSP SWELL_APP_PREFIX=Swell_vIPlugFaustDSP IGRAPHICS_NANOVG IGRAPHICS_METAL NO_PARAMS_MUTEX $(FAUST_DEFS)
+EXTRA_ALL_DEFS = OBJC_PREFIX=vIPlugFaustDSP SWELL_APP_PREFIX=Swell_vIPlugFaustDSP IGRAPHICS_NANOVG IGRAPHICS_METAL $(FAUST_DEFS)
 EXTRA_DEBUG_DEFS = DSP_FILE='"$(PROJECT_ROOT)/IPlugFaustDSP.dsp"'
 //EXTRA_RELEASE_DEFS =
 //EXTRA_TRACER_DEFS =

diff --git a/IPlug/IPlugPlatform.h b/IPlug/IPlugPlatform.h
@@ -50,14 +50,14 @@
 #include <cstring>
 #include <cstdlib>
 
-#ifdef NO_PARAMS_MUTEX
-#define ENTER_PARAMS_MUTEX
-#define LEAVE_PARAMS_MUTEX
-#define ENTER_PARAMS_MUTEX_STATIC
-#define LEAVE_PARAMS_MUTEX_STATIC
+#ifdef PARAMS_MUTEX
+  #define ENTER_PARAMS_MUTEX mParams_mutex.Enter(); Trace(TRACELOC, "%s", "ENTER_PARAMS_MUTEX")
+  #define LEAVE_PARAMS_MUTEX mParams_mutex.Leave(); Trace(TRACELOC, "%s", "LEAVE_PARAMS_MUTEX")
+  #define ENTER_PARAMS_MUTEX_STATIC _this->mParams_mutex.Enter(); Trace(TRACELOC, "%s", "ENTER_PARAMS_MUTEX")
+  #define LEAVE_PARAMS_MUTEX_STATIC _this->mParams_mutex.Leave(); Trace(TRACELOC, "%s", "LEAVE_PARAMS_MUTEX")
 #else
-#define ENTER_PARAMS_MUTEX mParams_mutex.Enter(); Trace(TRACELOC, "%s", "ENTER_PARAMS_MUTEX")
-#define LEAVE_PARAMS_MUTEX mParams_mutex.Leave(); Trace(TRACELOC, "%s", "LEAVE_PARAMS_MUTEX")
-#define ENTER_PARAMS_MUTEX_STATIC _this->mParams_mutex.Enter(); Trace(TRACELOC, "%s", "ENTER_PARAMS_MUTEX")
-#define LEAVE_PARAMS_MUTEX_STATIC _this->mParams_mutex.Leave(); Trace(TRACELOC, "%s", "LEAVE_PARAMS_MUTEX")
+  #define ENTER_PARAMS_MUTEX
+  #define LEAVE_PARAMS_MUTEX
+  #define ENTER_PARAMS_MUTEX_STATIC
+  #define LEAVE_PARAMS_MUTEX_STATIC
 #endif
diff --git a/IPlug/IPlugPluginBase.h b/IPlug/IPlugPluginBase.h
@@ -375,7 +375,7 @@ class IPluginBase : public EDITOR_DELEGATE_CLASS
   WDL_PtrList<IPreset> mPresets;
 #endif
 
-#ifndef NO_PARAMS_MUTEX
+#ifdef PARAMS_MUTEX
   /** Lock when accessing mParams (including via GetParam) from the audio thread */
   WDL_Mutex mParams_mutex;
 #endif  

diff --git a/Tests/IGraphicsTest/config/IGraphicsTest-ios.xcconfig b/Tests/IGraphicsTest/config/IGraphicsTest-ios.xcconfig
@@ -15,7 +15,7 @@ EXTRA_LNK_FLAGS = $(IGRAPHICS_LNK_FLAGS)
 //------------------------------
 // PREPROCESSOR MACROS
 
-EXTRA_ALL_DEFS = OBJC_PREFIX=vIGraphicsTest SWELL_APP_PREFIX=Swell_vIGraphicsTest NO_PARAMS_MUTEX IGRAPHICS_NANOVG IGRAPHICS_METAL
+EXTRA_ALL_DEFS = OBJC_PREFIX=vIGraphicsTest SWELL_APP_PREFIX=Swell_vIGraphicsTestIGRAPHICS_NANOVG IGRAPHICS_METAL
 //EXTRA_DEBUG_DEFS =
 //EXTRA_RELEASE_DEFS =
 //EXTRA_TRACER_DEFS =

diff --git a/Tests/IGraphicsTest/config/IGraphicsTest-mac.xcconfig b/Tests/IGraphicsTest/config/IGraphicsTest-mac.xcconfig
@@ -18,7 +18,7 @@ EXTRA_PLUGIN_DEFS = SWELL_NO_POSTMESSAGE
 //------------------------------
 // PREPROCESSOR MACROS
 
-EXTRA_ALL_DEFS = OBJC_PREFIX=vIGraphicsTest SWELL_APP_PREFIX=Swell_vIGraphicsTest IGRAPHICS_NANOVG IGRAPHICS_METAL NO_PARAMS_MUTEX
+EXTRA_ALL_DEFS = OBJC_PREFIX=vIGraphicsTest SWELL_APP_PREFIX=Swell_vIGraphicsTest IGRAPHICS_NANOVG IGRAPHICS_METAL
 //EXTRA_DEBUG_DEFS =
 //EXTRA_RELEASE_DEFS =
 //EXTRA_TRACER_DEFS =