From 8399cd8122024fecb5ad676aa236eab6110df520 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 18 Dec 2012 15:26:50 +0000 Subject: [PATCH] fix up discovery of VAMP plugins after ./waf install, which fixes crashes when reversing regions and doing timeFX operations with a "regular" install of ardour3 git-svn-id: svn://localhost/ardour2/branches/3.0@13673 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour.sh.in | 6 ++++++ libs/vamp-sdk/src/vamp-hostsdk/PluginLoader.cpp | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in index 9a9a48755b..80efee781a 100644 --- 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 9663710577..b3b2b45c68 100644 --- 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]; }