fix up discovery of VAMP plugins after ./waf install, which fixes crashes when revers...

git-svn-id: svn://localhost/ardour2/branches/3.0@13673 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in
index 9a9a48755b1dc9064301154c4cc4e28ddf3ee7b1..80efee781afe9bdd4bbd7de6a8037d64fbc692bb 100644 (file)
--- a/gtk2_ardour/ardour.sh.in
+++ b/gtk2_ardour/ardour.sh.in
@@ -47,6 +47,12 @@ export ARDOUR_DATA_PATH=@DATADIR@/ardour3
 export ARDOUR_CONFIG_PATH=@SYSCONFDIR@/ardour3
 export ARDOUR_DLL_PATH=@LIBDIR@/ardour3
 
+#
+# VAMP has its own lookup path
+# 
+
+export VAMP_PATH=@LIBDIR@/ardour3/vamp
+
 if [ $# -gt 0 ] ; then
     case $1 in
         -g|--gdb) GDB=gdb; shift ;;

diff --git a/libs/vamp-sdk/src/vamp-hostsdk/PluginLoader.cpp b/libs/vamp-sdk/src/vamp-hostsdk/PluginLoader.cpp
index 96637105778582907d883028a14d519aa60c8e10..b3b2b45c68cf001f0efbfef62fc5ea8913b748fc 100644 (file)
--- a/libs/vamp-sdk/src/vamp-hostsdk/PluginLoader.cpp
+++ b/libs/vamp-sdk/src/vamp-hostsdk/PluginLoader.cpp
@@ -358,14 +358,11 @@ PluginLoader::Impl::getLibraryPathForPlugin(PluginKey plugin)
 {
     if (m_pluginLibraryNameMap.find(plugin) == m_pluginLibraryNameMap.end()) {
         if (m_allPluginsEnumerated) return "";
-        cerr << "plug " << plugin << " not found enumerate" << endl;
         enumeratePlugins(plugin);
     }
     if (m_pluginLibraryNameMap.find(plugin) == m_pluginLibraryNameMap.end()) {
-        cerr << "plug " << plugin << " not found enumerate" << endl;
         return "";
     }
-    cerr << "Did find plugin " << plugin << endl;
     return m_pluginLibraryNameMap[plugin];
 }