add OFX::Host::PluginCache::useStdOFXPluginsLocation(bool) to select …

…wether the default plugins location should be used
NatronGitHub · Jan 10, 2017 · 55f4281 · 55f4281
1 parent 42463b8
commit 55f4281
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/HostSupport/include/ofxhPluginCache.h b/HostSupport/include/ofxhPluginCache.h
@@ -382,6 +382,7 @@ namespace OFX {
       bool _dirty;
       bool _enablePluginSeek;       ///< Turn off to make all seekPluginFile() calls return an empty string
 
+      static bool _useStdOFXPluginsLocation;
       static PluginCache* gPluginCachePtr; ///< singleton plugin cache
 
     public:
@@ -391,6 +392,9 @@ namespace OFX {
       /// dtor
       ~PluginCache();
 
+      /// call this before the first call to getPluginCache() in order to ignore the standard OFX plugin path
+      static void useStdOFXPluginsLocation(bool val) { _useStdOFXPluginsLocation = val; }
+
       /// get our plugin cache
       static PluginCache* getPluginCache();
 

diff --git a/HostSupport/src/ofxhPluginCache.cpp b/HostSupport/src/ofxhPluginCache.cpp
@@ -104,6 +104,7 @@ static const char *getArchStr()
 #include "shlobj.h"
 #endif
 
+bool OFX::Host::PluginCache::_useStdOFXPluginsLocation = true;
 OFX::Host::PluginCache* OFX::Host::PluginCache::gPluginCachePtr = 0;
 
 // Define this to enable ofx plugin cache debug messages.
@@ -274,7 +275,10 @@ PluginCache::PluginCache() : _hostSpec(0), _xmlCurrentBinary(0), _xmlCurrentPlug
 
     _pluginPath.push_back(path);
   }
-
+
+  if (!_useStdOFXPluginsLocation)
+    return;
+
 #if defined(WINDOWS)
 
   std::wstring wpath = getStdOFXPluginPath();