Patch from Tim Mayberry:

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

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 0cfbdd17eb7cf8cfe74eb46695d40369630eaf11..a666e7b53ecab8372578342ba18aca1fe62097f3 100644 (file)
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -31,14 +31,14 @@
 #include <fstream>
 
 #ifdef WINDOWS_VST_SUPPORT
-#include <fst.h>
+#include "fst.h"
 #include "pbd/basename.h"
 #include <cstring>
 #endif // WINDOWS_VST_SUPPORT
 
 #ifdef LXVST_SUPPORT
-#include <ardour/vstfx.h>
-#include <pbd/basename.h>
+#include "ardour/linux_vst_support.h"
+#include "pbd/basename.h"
 #include <cstring>
 #endif //LXVST_SUPPORT
 
@@ -53,7 +53,7 @@
 #include "ardour/ladspa_plugin.h"
 #include "ardour/plugin.h"
 #include "ardour/plugin_manager.h"
-#include "ardour/session.h"
+#include "ardour/rc_configuration.h"
 
 #ifdef LV2_SUPPORT
 #include "ardour/lv2_plugin.h"
@@ -696,7 +696,6 @@ PluginManager::lxvst_discover (string path)
        char buf[32];
 
        if ((finfo = vstfx_get_info (const_cast<char *> (path.c_str()))) == 0) {
-               warning << "Cannot get linuxVST information from " << path << endmsg;
                return -1;
        }
 
@@ -736,6 +735,7 @@ PluginManager::lxvst_discover (string path)
        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)) {
+                               warning << "Ignoring duplicate Linux VST plugin " << info->name << "\n";
                                vstfx_free_info(finfo);
                                return 0;
                        }