Mercurial > hg > tony

changeset 594:b76234d1a217

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Be stricter about Vamp path - don't use external location at all unless in Tony path variable explicitly
author Chris Cannam
date Tue, 17 Sep 2019 11:40:43 +0100
parents c82326286b02
children 525076f84504
files main/main.cpp
diffstat 1 files changed, 4 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/main/main.cpp	Tue Sep 17 11:26:47 2019 +0100
+++ b/main/main.cpp	Tue Sep 17 11:40:43 2019 +0100
@@ -151,7 +151,7 @@
 static void
 setupTonyVampPath()
 {
-    QString tonyVampPath = getEnvQStr("TONY_VAMP_PATH");
+    QString myVampPath = getEnvQStr("TONY_VAMP_PATH");
 
 #ifdef Q_OS_WIN32
     QChar sep(';');
@@ -159,7 +159,7 @@
     QChar sep(':');
 #endif
     
-    if (tonyVampPath == "") {
+    if (myVampPath == "") {
         
         QString appName = QApplication::applicationName();
         QString myDir = QApplication::applicationDirPath();
@@ -186,17 +186,10 @@
 #endif
     }
 
-    std::vector<std::string> vampPathList = 
-        Vamp::PluginHostAdapter::getPluginPath();
-
-    for (auto p: vampPathList) {
-        tonyVampPath = tonyVampPath + sep + QString::fromUtf8(p.c_str());
-    }
-
-    SVCERR << "Setting VAMP_PATH to " << tonyVampPath
+    SVCERR << "Setting VAMP_PATH to " << myVampPath
            << " for Tony plugins" << endl;
 
-    QString env = "VAMP_PATH=" + tonyVampPath;
+    QString env = "VAMP_PATH=" + myVampPath;
 
     // Windows lacks setenv, must use putenv (different arg convention)
     putEnvQStr(env);