ardour/livetrax
13
0
Fork 0
Code

avoid duplicate panners by checking names, not symlinks

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10636 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-11-16 00:14:06 +00:00
parent 535f52c1b5
commit 71f69453ed
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libs/ardour/panner_manager.cc
View File

@ -20,11 +20,11 @@
#include <unistd.h>
#include <glibmm/pattern.h>
#include <glibmm/fileutils.h>
#include "pbd/error.h"
#include "pbd/compose.h"
#include "pbd/file_utils.h"
#include "pbd/symlink.h"
#include "ardour/panner_manager.h"
#include "ardour/panner_search_path.h"
@ -87,17 +87,20 @@ PannerManager::panner_discover (string path)
{
PannerInfo* pinfo;
/* don't look in symlinks, because otherwise we find too many versions
* of the same library.
*/
if (PBD::is_symlink (path)) {
return 0;
}
if ((pinfo = get_descriptor (path)) != 0) {
panner_info.push_back (pinfo);
info << string_compose(_("Panner discovered: \"%1\" in %2"), pinfo->descriptor.name, path) << endmsg;
list<PannerInfo*>::iterator i;
for (i = panner_info.begin(); i != panner_info.end(); ++i) {
if (pinfo->descriptor.name == (*i)->descriptor.name) {
break;
}
}
if (i == panner_info.end()) {
panner_info.push_back (pinfo);
info << string_compose(_("Panner discovered: \"%1\" in %2"), pinfo->descriptor.name, path) << endmsg;
}
}
return 0;