ardour/livetrax
13
0
Fork 0
Code

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

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13673 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-12-18 15:26:50 +00:00
parent 18f465393b
commit 8399cd8122
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk2_ardour/ardour.sh.in
View File

@ -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 ;;

3
libs/vamp-sdk/src/vamp-hostsdk/PluginLoader.cpp
View File

@ -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];
}