change several startup messages to be triggered only by -D (debug) options

[ardour.git] / libs / ardour / plugin_manager.cc

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index f7a46117a27e8fa5c717815f0b3a54198b4c5e36..dc717e6b8c39ceeddeb351fb844e489ee537593f 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -47,12 +47,13 @@
 #include "pbd/pathscanner.h"
 #include "pbd/whitespace.h"
 
+#include "ardour/debug.h"
+#include "ardour/filesystem_paths.h"
 #include "ardour/ladspa.h"
-#include "ardour/session.h"
-#include "ardour/plugin_manager.h"
-#include "ardour/plugin.h"
 #include "ardour/ladspa_plugin.h"
-#include "ardour/filesystem_paths.h"
+#include "ardour/plugin.h"
+#include "ardour/plugin_manager.h"
+#include "ardour/session.h"
 
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
@@ -66,7 +67,7 @@
 #include "ardour/lxvst_plugin.h"
 #endif
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
 #include "ardour/audio_unit.h"
 #include <Carbon/Carbon.h>
 #endif
@@ -94,14 +95,6 @@ PluginManager::PluginManager ()
 
        load_statuses ();
 
-#ifdef HAVE_AUDIOUNITS
-       ProcessSerialNumber psn = { 0, kCurrentProcess };
-       OSStatus returnCode = TransformProcessType(& psn, kProcessTransformToForegroundApplication);
-       if( returnCode != 0) {
-               error << _("Cannot become GUI app") << endmsg;
-       }
-#endif
-
        if ((s = getenv ("LADSPA_RDF_PATH"))){
                lrdf_path = s;
        }
@@ -168,6 +161,8 @@ PluginManager::~PluginManager()
 void
 PluginManager::refresh ()
 {
+       DEBUG_TRACE (DEBUG::PluginManager, "PluginManager::refresh\n");
+
        ladspa_refresh ();
 #ifdef LV2_SUPPORT
        lv2_refresh ();
@@ -184,7 +179,7 @@ PluginManager::refresh ()
        }
 #endif //Native linuxVST SUPPORT
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
        au_refresh ();
 #endif
 
@@ -236,6 +231,8 @@ PluginManager::ladspa_refresh ()
 
        }
 
+       DEBUG_TRACE (DEBUG::PluginManager, string_compose ("LADSPA: search along: [%1]\n", ladspa_path));
+
        ladspa_discover_from_path (ladspa_path);
 }
 
@@ -509,10 +506,11 @@ PluginManager::lv2_refresh ()
 }
 #endif
 
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
 void
 PluginManager::au_refresh ()
 {
+       DEBUG_TRACE (DEBUG::PluginManager, "AU: refresh\n");
        delete _au_plugin_info;
        _au_plugin_info = AUPluginInfo::discover();
 }
@@ -562,7 +560,7 @@ PluginManager::vst_discover_from_path (string path)
        vector<string *>::iterator x;
        int ret = 0;
 
-       info << "detecting VST plugins along " << path << endmsg;
+       DEBUG_TRACE (DEBUG::PluginManager, string_compose ("detecting VST plugins along %1\n", path));
 
        plugin_objects = scanner (vst_path, vst_filter, 0, true, true);
 
@@ -628,13 +626,14 @@ PluginManager::vst_discover (string path)
 void
 PluginManager::lxvst_refresh ()
 {
-       if (_lxvst_plugin_info)
+       if (_lxvst_plugin_info) {
                _lxvst_plugin_info->clear ();
-       else
+       } else {
                _lxvst_plugin_info = new ARDOUR::PluginInfoList();
+       }
 
        if (lxvst_path.length() == 0) {
-               lxvst_path = "/usr/local/lib/lxvst:/usr/lib/lxvst";
+               lxvst_path = "/usr/local/lib64/lxvst:/usr/local/lib/lxvst:/usr/lib64/lxvst:/usr/lib/lxvst";
        }
 
        lxvst_discover_from_path (lxvst_path);
@@ -651,7 +650,7 @@ PluginManager::add_lxvst_directory (string path)
        return -1;
 }
 
-static bool lxvst_filter (const string& str, void *arg)
+static bool lxvst_filter (const string& str, void *)
 {
        /* Not a dotfile, has a prefix before a period, suffix is "so" */
 
@@ -666,7 +665,7 @@ PluginManager::lxvst_discover_from_path (string path)
        vector<string *>::iterator x;
        int ret = 0;
 
-       info << "Discovering linuxVST plugins along " << path << endmsg;
+       DEBUG_TRACE (DEBUG::PluginManager, string_compose ("Discovering linuxVST plugins along %1\n", path));
 
        plugin_objects = scanner (lxvst_path, lxvst_filter, 0, true, true);
 
@@ -676,8 +675,6 @@ PluginManager::lxvst_discover_from_path (string path)
                }
        }
 
-       info << "Done linuxVST discover" << endmsg;
-
        vector_delete (plugin_objects);
        return ret;
 }
@@ -718,6 +715,22 @@ PluginManager::lxvst_discover (string path)
        info->n_outputs.set_audio (finfo->numOutputs);
        info->n_inputs.set_midi (finfo->wantMidi ? 1 : 0);
        info->type = ARDOUR::LXVST;
+
+        /* Make sure we don't find the same plugin in more than one place along
+          the LXVST_PATH We can't use a simple 'find' because the path is included
+          in the PluginInfo, and that is the one thing we can be sure MUST be
+          different if a duplicate instance is found.  So we just compare the type
+          and unique ID (which for some VSTs isn't actually unique...)
+       */
+       
+       if (!_lxvst_plugin_info->empty()) {
+               for (PluginInfoList::iterator i =_lxvst_plugin_info->begin(); i != _lxvst_plugin_info->end(); ++i) {
+                       if ((info->type == (*i)->type)&&(info->unique_id == (*i)->unique_id)) {
+                               vstfx_free_info(finfo);
+                               return 0;
+                       }
+               }
+       }
        
        _lxvst_plugin_info->push_back (info);
        vstfx_free_info (finfo);
@@ -930,7 +943,7 @@ PluginManager::lv2_plugin_info ()
 ARDOUR::PluginInfoList&
 PluginManager::au_plugin_info ()
 {
-#ifdef HAVE_AUDIOUNITS
+#ifdef AUDIOUNIT_SUPPORT
        if (!_au_plugin_info)
                au_refresh();
        return *_au_plugin_info;