Chris@92
|
1 /* -*- c-basic-offset: 8 indent-tabs-mode: t -*- */
|
fazekasgy@37
|
2 /*
|
fazekasgy@37
|
3
|
fazekasgy@37
|
4 * Vampy : This plugin is a wrapper around the Vamp plugin API.
|
fazekasgy@37
|
5 * It allows for writing Vamp plugins in Python.
|
fazekasgy@37
|
6
|
fazekasgy@37
|
7 * Centre for Digital Music, Queen Mary University of London.
|
fazekasgy@37
|
8 * Copyright (C) 2008-2009 Gyorgy Fazekas, QMUL. (See Vamp sources
|
fazekasgy@37
|
9 * for licence information.)
|
fazekasgy@37
|
10
|
fazekasgy@37
|
11 */
|
fazekasgy@37
|
12
|
fazekasgy@37
|
13
|
fazekasgy@37
|
14 #include "PyPlugScanner.h"
|
Chris@92
|
15 #include "PyExtensionManager.h"
|
Chris@92
|
16 #include "Debug.h"
|
fazekasgy@37
|
17 #include <algorithm>
|
fazekasgy@37
|
18 #include <cstdlib>
|
fazekasgy@37
|
19 //#include "vamp-hostsdk/PluginHostAdapter.h"
|
fazekasgy@37
|
20
|
fazekasgy@37
|
21 #ifdef _WIN32
|
fazekasgy@37
|
22 #include <windows.h>
|
fazekasgy@37
|
23 #include <tchar.h>
|
fazekasgy@37
|
24 #define pathsep ("\\")
|
fazekasgy@37
|
25 #else
|
fazekasgy@37
|
26 #include <dirent.h>
|
fazekasgy@37
|
27 #include <dlfcn.h>
|
fazekasgy@37
|
28 #define pathsep ("/")
|
fazekasgy@37
|
29 #endif
|
fazekasgy@37
|
30 #define joinPath(a,b) ( (a)+pathsep+(b) )
|
fazekasgy@37
|
31
|
fazekasgy@37
|
32 using std::string;
|
fazekasgy@37
|
33 using std::vector;
|
fazekasgy@37
|
34 using std::cerr;
|
fazekasgy@37
|
35 using std::endl;
|
fazekasgy@37
|
36 using std::find;
|
fazekasgy@37
|
37
|
fazekasgy@37
|
38 PyPlugScanner::PyPlugScanner()
|
fazekasgy@37
|
39 {
|
fazekasgy@37
|
40
|
fazekasgy@37
|
41 }
|
fazekasgy@37
|
42
|
fazekasgy@37
|
43 PyPlugScanner *PyPlugScanner::m_instance = NULL;
|
fazekasgy@37
|
44 bool PyPlugScanner::m_hasInstance = false;
|
fazekasgy@37
|
45
|
fazekasgy@37
|
46 PyPlugScanner*
|
fazekasgy@37
|
47 PyPlugScanner::getInstance()
|
fazekasgy@37
|
48 {
|
fazekasgy@37
|
49 if (!m_hasInstance) {
|
fazekasgy@37
|
50 m_instance = new PyPlugScanner();
|
fazekasgy@37
|
51 m_hasInstance = true;
|
fazekasgy@37
|
52 }
|
fazekasgy@37
|
53 return m_instance;
|
fazekasgy@37
|
54 }
|
fazekasgy@37
|
55
|
fazekasgy@37
|
56 void
|
fazekasgy@37
|
57 PyPlugScanner::setPath(vector<string> path)
|
fazekasgy@37
|
58 {
|
fazekasgy@37
|
59 m_path=path;
|
fazekasgy@37
|
60 }
|
fazekasgy@37
|
61
|
fazekasgy@37
|
62 // We assume that each script on the path has one valid class
|
fazekasgy@37
|
63 vector<string>
|
fazekasgy@37
|
64 PyPlugScanner::getPyPlugs()
|
fazekasgy@37
|
65 {
|
fazekasgy@37
|
66 //for_each m_path listFiles then return vector<pyPlugs>
|
fazekasgy@37
|
67 //key format: FullPathString/FileName.py:ClassName
|
fazekasgy@37
|
68
|
fazekasgy@37
|
69 bool getCompiled = true;
|
fazekasgy@37
|
70 char* getPyc = getenv("VAMPY_COMPILED");
|
fazekasgy@37
|
71 if (getPyc) {
|
fazekasgy@37
|
72 string value(getPyc);
|
fazekasgy@37
|
73 cerr << "VAMPY_COMPILED=" << value << endl;
|
fazekasgy@37
|
74 getCompiled = value.compare("1")?false:true;
|
fazekasgy@37
|
75 }
|
fazekasgy@37
|
76
|
fazekasgy@37
|
77 vector<string> pyPlugs;
|
fazekasgy@37
|
78 string pluginKey;
|
fazekasgy@37
|
79 PyObject *pyClass;
|
fazekasgy@37
|
80
|
fazekasgy@37
|
81 for (size_t i = 0; i < m_path.size(); ++i) {
|
fazekasgy@37
|
82
|
fazekasgy@37
|
83 vector<string> files = listFiles(m_path[i],"py");
|
fazekasgy@37
|
84
|
fazekasgy@37
|
85 /// recognise byte compiled plugins
|
fazekasgy@37
|
86 if (getCompiled) {
|
fazekasgy@58
|
87 vector<string> pyc_files = listFiles(m_path[i],"pyc");
|
fazekasgy@58
|
88 vector<string> pyo_files = listFiles(m_path[i],"pyo");
|
fazekasgy@58
|
89 mergeFileLists(pyc_files,pyo_files,".pyo");
|
fazekasgy@58
|
90 mergeFileLists(pyo_files,files,".py");
|
fazekasgy@37
|
91 }
|
fazekasgy@37
|
92
|
fazekasgy@37
|
93 for (vector<string>::iterator fi = files.begin();
|
fazekasgy@37
|
94 fi != files.end(); ++fi) {
|
fazekasgy@37
|
95 string script = *fi;
|
fazekasgy@37
|
96 if (!script.empty()) {
|
fazekasgy@37
|
97 string classname=script.substr(0,script.rfind('.'));
|
fazekasgy@37
|
98 pluginKey=joinPath(m_path[i],script)+":"+classname;
|
fazekasgy@37
|
99 pyClass = getScriptClass(m_path[i],classname);
|
fazekasgy@37
|
100 if (pyClass == NULL)
|
Chris@92
|
101 cerr << "Warning: Syntax error or other problem in scanning VamPy plugin: "
|
fazekasgy@37
|
102 << classname << ". Avoiding plugin." << endl;
|
fazekasgy@37
|
103 else {
|
fazekasgy@37
|
104 pyPlugs.push_back(pluginKey);
|
fazekasgy@37
|
105 m_pyClasses.push_back(pyClass);
|
Chris@92
|
106 }
|
fazekasgy@37
|
107 }
|
fazekasgy@37
|
108 }
|
fazekasgy@37
|
109 }
|
fazekasgy@37
|
110
|
fazekasgy@37
|
111 return pyPlugs;
|
fazekasgy@37
|
112
|
fazekasgy@37
|
113 }
|
fazekasgy@37
|
114
|
fazekasgy@37
|
115 /// insert python byte code names (.pyc) if a .py file can not be found
|
fazekasgy@37
|
116 /// The interpreter automatically generates byte code files and executes
|
fazekasgy@37
|
117 /// them if they exist. Therefore, we prefer .py files, but we allow
|
fazekasgy@37
|
118 /// (relatively) closed source distributions by recognising .pyc files.
|
fazekasgy@37
|
119 void
|
fazekasgy@58
|
120 PyPlugScanner::mergeFileLists(vector<string> &src, vector<string> &tg, string target_ext)
|
fazekasgy@37
|
121 {
|
fazekasgy@58
|
122 for (vector<string>::iterator srcit = src.begin();
|
fazekasgy@58
|
123 srcit != src.end(); ++srcit) {
|
fazekasgy@58
|
124 // cerr << *srcit;
|
fazekasgy@58
|
125 string src_name = *srcit;
|
fazekasgy@58
|
126 string tg_name = src_name.substr(0,src_name.rfind('.')) + target_ext;
|
fazekasgy@58
|
127 vector<string>::iterator tgit = find (tg.begin(), tg.end(), tg_name);
|
fazekasgy@58
|
128 if (tgit == tg.end()) tg.push_back(src_name);
|
fazekasgy@37
|
129 }
|
fazekasgy@37
|
130
|
fazekasgy@37
|
131 }
|
fazekasgy@37
|
132
|
fazekasgy@37
|
133
|
fazekasgy@37
|
134 //For now return one class object found in each script
|
fazekasgy@37
|
135 vector<PyObject*>
|
fazekasgy@37
|
136 PyPlugScanner::getPyClasses()
|
fazekasgy@37
|
137 {
|
fazekasgy@37
|
138 return m_pyClasses;
|
fazekasgy@37
|
139
|
fazekasgy@37
|
140 }
|
fazekasgy@37
|
141
|
fazekasgy@37
|
142 //Validate
|
fazekasgy@37
|
143 //This should not be called more than once!
|
fazekasgy@37
|
144 PyObject*
|
fazekasgy@37
|
145 PyPlugScanner::getScriptClass(string path, string classname)
|
fazekasgy@37
|
146 {
|
fazekasgy@37
|
147 //Add plugin path to active Python Path
|
Chris@108
|
148 string pyCmd =
|
Chris@108
|
149 "import sys\n"
|
Chris@108
|
150 "sys.path.append('" + path + "')\n"
|
Chris@108
|
151 "sys.argv = ['" + classname + "']\n";
|
fazekasgy@37
|
152 PyRun_SimpleString(pyCmd.c_str());
|
fazekasgy@37
|
153
|
fazekasgy@37
|
154 //Assign an object to the source code
|
fazekasgy@37
|
155 PyObject *pySource = PyString_FromString(classname.c_str());
|
fazekasgy@37
|
156
|
fazekasgy@37
|
157 //Import it as a module into the py interpreter
|
fazekasgy@37
|
158 PyObject *pyModule = PyImport_Import(pySource);
|
fazekasgy@37
|
159 PyObject* pyError = PyErr_Occurred();
|
Chris@70
|
160 if (pyError) {
|
fazekasgy@37
|
161 cerr << "ERROR: error importing source: " << classname << endl;
|
fazekasgy@37
|
162 PyErr_Print();
|
fazekasgy@37
|
163 Py_DECREF(pySource);
|
fazekasgy@37
|
164 Py_CLEAR(pyModule); // safer if pyModule==NULL
|
fazekasgy@37
|
165 return NULL;
|
fazekasgy@37
|
166 }
|
fazekasgy@37
|
167 Py_DECREF(pySource);
|
fazekasgy@37
|
168
|
fazekasgy@37
|
169 //Read the dictionary object holding the namespace of the module (borrowed reference)
|
fazekasgy@37
|
170 PyObject *pyDict = PyModule_GetDict(pyModule);
|
fazekasgy@37
|
171 Py_DECREF(pyModule);
|
fazekasgy@37
|
172
|
fazekasgy@37
|
173 //Get the PluginClass from the module (borrowed reference)
|
fazekasgy@37
|
174 PyObject *pyClass = PyDict_GetItemString(pyDict, classname.c_str());
|
fazekasgy@37
|
175
|
Chris@92
|
176 if (pyClass == Py_None) {
|
Chris@92
|
177 DSTREAM << "Vampy: class name " << classname
|
Chris@92
|
178 << " is None in module; assuming it was scrubbed "
|
Chris@92
|
179 << "following an earlier load failure" << endl;
|
Chris@92
|
180 return NULL;
|
Chris@92
|
181 }
|
Chris@92
|
182
|
Chris@92
|
183 // Check if class is present and a callable method is implemented
|
Chris@92
|
184 if (!pyClass || !PyCallable_Check(pyClass)) {
|
fazekasgy@37
|
185 cerr << "ERROR: callable plugin class could not be found in source: " << classname << endl
|
fazekasgy@37
|
186 << "Hint: plugin source filename and plugin class name must be the same." << endl;
|
fazekasgy@37
|
187 PyErr_Print();
|
fazekasgy@37
|
188 return NULL;
|
fazekasgy@37
|
189 }
|
Chris@92
|
190
|
Chris@92
|
191 bool acceptable = true;
|
Chris@92
|
192
|
Chris@92
|
193 // Check that the module doesn't have any name collisions with
|
Chris@92
|
194 // our own symbols
|
Chris@92
|
195
|
Chris@92
|
196 int i = 0;
|
Chris@92
|
197 while (PyExtensionManager::m_exposedNames[i]) {
|
Chris@92
|
198
|
Chris@92
|
199 const char* name = PyExtensionManager::m_exposedNames[i];
|
Chris@92
|
200 i++;
|
Chris@92
|
201
|
Chris@92
|
202 PyObject *item = PyDict_GetItemString(pyDict, name);
|
Chris@92
|
203 if (!item) continue;
|
Chris@92
|
204
|
Chris@92
|
205 if (item == Py_None) {
|
Chris@92
|
206 DSTREAM << "Vampy: name " << name << " is None "
|
Chris@92
|
207 << "in module " << classname
|
Chris@92
|
208 << "; assuming it was cleared on unload"
|
Chris@92
|
209 << endl;
|
Chris@92
|
210 continue;
|
Chris@92
|
211 }
|
Chris@92
|
212
|
Chris@92
|
213 PyTypeObject *metatype = Py_TYPE(item);
|
Chris@92
|
214
|
Chris@92
|
215 if (!strcmp(name, "frame2RealTime")) {
|
Chris@92
|
216 if (metatype != &PyCFunction_Type) {
|
Chris@92
|
217 cerr << "ERROR: plugin " << classname
|
Chris@92
|
218 << " redefines Vampy function name \""
|
Chris@92
|
219 << name << "\" (metatype is \""
|
Chris@92
|
220 << metatype->tp_name << "\")" << endl;
|
Chris@92
|
221 acceptable = false;
|
Chris@92
|
222 break;
|
Chris@92
|
223 } else {
|
Chris@92
|
224 continue;
|
Chris@92
|
225 }
|
Chris@92
|
226 }
|
Chris@92
|
227
|
Chris@92
|
228 if (metatype != &PyType_Type) {
|
Chris@92
|
229 cerr << "ERROR: plugin " << classname
|
Chris@92
|
230 << " uses Vampy reserved type name \"" << name
|
Chris@92
|
231 << "\" for non-type (metatype is \""
|
Chris@92
|
232 << metatype->tp_name << "\")" << endl;
|
Chris@92
|
233 acceptable = false;
|
Chris@92
|
234 break;
|
Chris@92
|
235 }
|
Chris@92
|
236
|
Chris@92
|
237 PyTypeObject *type = (PyTypeObject *)item;
|
Chris@92
|
238 if (type->tp_name == std::string("vampy.") + name) {
|
Chris@92
|
239 DSTREAM << "Vampy: acceptable Vampy type name "
|
Chris@92
|
240 << type->tp_name << " found in module" << endl;
|
Chris@92
|
241 } else {
|
Chris@92
|
242 cerr << "ERROR: plugin " << classname
|
Chris@92
|
243 << " redefines Vampy type \"" << name << "\"";
|
Chris@92
|
244 if (strcmp(type->tp_name, name)) {
|
Chris@92
|
245 cerr << " (as \"" << type->tp_name << "\")";
|
Chris@92
|
246 }
|
Chris@92
|
247 cerr << endl;
|
Chris@92
|
248 acceptable = false;
|
Chris@92
|
249 break;
|
Chris@92
|
250 }
|
Chris@92
|
251 }
|
Chris@92
|
252
|
Chris@92
|
253 if (acceptable) {
|
Chris@92
|
254 return pyClass;
|
Chris@92
|
255 } else {
|
Chris@92
|
256 PyObject *key = PyString_FromString(classname.c_str());
|
Chris@92
|
257 PyDict_SetItem(pyDict, key, Py_None);
|
Chris@92
|
258 Py_DECREF(key);
|
Chris@92
|
259 return NULL;
|
Chris@92
|
260 }
|
fazekasgy@37
|
261 }
|
fazekasgy@37
|
262
|
fazekasgy@37
|
263
|
fazekasgy@37
|
264
|
fazekasgy@37
|
265 // Return a list of files in dir with given extension
|
fazekasgy@37
|
266 // Code taken from hostext/PluginLoader.cpp
|
fazekasgy@37
|
267 vector<string>
|
fazekasgy@37
|
268 PyPlugScanner::listFiles(string dir, string extension)
|
fazekasgy@37
|
269 {
|
fazekasgy@37
|
270 vector<string> files;
|
fazekasgy@37
|
271
|
fazekasgy@37
|
272 #ifdef _WIN32
|
fazekasgy@37
|
273
|
fazekasgy@37
|
274 string expression = dir + "\\*." + extension;
|
fazekasgy@37
|
275 WIN32_FIND_DATA data;
|
fazekasgy@37
|
276 HANDLE fh = FindFirstFile(expression.c_str(), &data);
|
fazekasgy@37
|
277 if (fh == INVALID_HANDLE_VALUE) return files;
|
fazekasgy@37
|
278
|
fazekasgy@37
|
279 bool ok = true;
|
fazekasgy@37
|
280 while (ok) {
|
fazekasgy@37
|
281 files.push_back(data.cFileName);
|
fazekasgy@37
|
282 ok = FindNextFile(fh, &data);
|
fazekasgy@37
|
283 }
|
fazekasgy@37
|
284
|
fazekasgy@37
|
285 FindClose(fh);
|
fazekasgy@37
|
286
|
fazekasgy@37
|
287 #else
|
fazekasgy@37
|
288
|
fazekasgy@37
|
289 size_t extlen = extension.length();
|
fazekasgy@37
|
290 DIR *d = opendir(dir.c_str());
|
fazekasgy@37
|
291 if (!d) return files;
|
fazekasgy@37
|
292
|
fazekasgy@37
|
293 struct dirent *e = 0;
|
fazekasgy@37
|
294 while ((e = readdir(d))) {
|
fazekasgy@37
|
295 size_t len = strlen(e->d_name);
|
fazekasgy@37
|
296 if (len < extlen + 2 ||
|
fazekasgy@37
|
297 e->d_name + len - extlen - 1 != "." + extension) {
|
fazekasgy@37
|
298 continue;
|
fazekasgy@37
|
299 }
|
fazekasgy@37
|
300 files.push_back(e->d_name);
|
fazekasgy@37
|
301 }
|
fazekasgy@37
|
302
|
fazekasgy@37
|
303 closedir(d);
|
fazekasgy@37
|
304 #endif
|
fazekasgy@37
|
305
|
fazekasgy@37
|
306 return files;
|
fazekasgy@37
|
307 }
|
fazekasgy@37
|
308
|
fazekasgy@37
|
309
|
fazekasgy@37
|
310 //!!! It would probably be better to actually call
|
fazekasgy@37
|
311 // PluginHostAdapter::getPluginPath. That would mean this "plugin"
|
fazekasgy@37
|
312 // needs to link against vamp-hostsdk, but that's probably acceptable
|
fazekasgy@37
|
313 // as it is sort of a host as well.
|
fazekasgy@37
|
314
|
fazekasgy@37
|
315 // std::vector<std::string>
|
fazekasgy@37
|
316 // PyPlugScanner::getAllValidPath()
|
fazekasgy@37
|
317 // {
|
fazekasgy@37
|
318 // Vamp::PluginHostAdapter host_adapter( ??? );
|
fazekasgy@37
|
319 // return host_adapter.getPluginPath();
|
fazekasgy@37
|
320 // }
|
fazekasgy@37
|
321
|
fazekasgy@37
|
322 // tried to implement it, but found a bit confusing how to
|
fazekasgy@37
|
323 // instantiate the host adapter here...
|
fazekasgy@37
|
324
|
fazekasgy@37
|
325
|
fazekasgy@37
|
326 //Return correct plugin directories as per platform
|
fazekasgy@37
|
327 //Code taken from vamp-sdk/PluginHostAdapter.cpp
|
fazekasgy@37
|
328 std::vector<std::string>
|
fazekasgy@37
|
329 PyPlugScanner::getAllValidPath()
|
fazekasgy@37
|
330 {
|
fazekasgy@37
|
331 std::vector<std::string> path;
|
fazekasgy@37
|
332 std::string envPath;
|
fazekasgy@37
|
333
|
Chris@97
|
334 bool nonNative32 = false;
|
Chris@97
|
335 #ifdef _WIN32
|
Chris@97
|
336 BOOL (WINAPI *fnIsWow64Process)(HANDLE, PBOOL) =
|
Chris@97
|
337 (BOOL (WINAPI *)(HANDLE, PBOOL)) GetProcAddress
|
Chris@97
|
338 (GetModuleHandle(TEXT("kernel32")), "IsWow64Process");
|
Chris@97
|
339 if (fnIsWow64Process) {
|
Chris@97
|
340 BOOL wow64 = FALSE;
|
Chris@97
|
341 if (fnIsWow64Process(GetCurrentProcess(), &wow64) && wow64) {
|
Chris@97
|
342 nonNative32 = true;
|
Chris@97
|
343 }
|
Chris@97
|
344 }
|
Chris@97
|
345 #endif
|
Chris@97
|
346
|
Chris@97
|
347 char *cpath;
|
Chris@97
|
348 if (nonNative32) {
|
Chris@97
|
349 cpath = getenv("VAMP_PATH_32");
|
Chris@97
|
350 } else {
|
Chris@97
|
351 cpath = getenv("VAMP_PATH");
|
Chris@97
|
352 }
|
fazekasgy@37
|
353 if (cpath) envPath = cpath;
|
fazekasgy@37
|
354
|
fazekasgy@37
|
355 #ifdef _WIN32
|
fazekasgy@37
|
356 #define PATH_SEPARATOR ';'
|
fazekasgy@37
|
357 #define DEFAULT_VAMP_PATH "%ProgramFiles%\\Vamp Plugins"
|
fazekasgy@37
|
358 #else
|
fazekasgy@37
|
359 #define PATH_SEPARATOR ':'
|
fazekasgy@37
|
360 #ifdef __APPLE__
|
fazekasgy@37
|
361 #define DEFAULT_VAMP_PATH "$HOME/Library/Audio/Plug-Ins/Vamp:/Library/Audio/Plug-Ins/Vamp"
|
fazekasgy@37
|
362 #else
|
fazekasgy@37
|
363 #define DEFAULT_VAMP_PATH "$HOME/vamp:$HOME/.vamp:/usr/local/lib/vamp:/usr/lib/vamp"
|
fazekasgy@37
|
364 #endif
|
fazekasgy@37
|
365 #endif
|
fazekasgy@37
|
366
|
fazekasgy@37
|
367 if (envPath == "") {
|
fazekasgy@37
|
368 envPath = DEFAULT_VAMP_PATH;
|
fazekasgy@37
|
369 char *chome = getenv("HOME");
|
fazekasgy@37
|
370 if (chome) {
|
fazekasgy@37
|
371 std::string home(chome);
|
fazekasgy@37
|
372 std::string::size_type f;
|
fazekasgy@37
|
373 while ((f = envPath.find("$HOME")) != std::string::npos &&
|
fazekasgy@37
|
374 f < envPath.length()) {
|
fazekasgy@37
|
375 envPath.replace(f, 5, home);
|
fazekasgy@37
|
376 }
|
fazekasgy@37
|
377 }
|
fazekasgy@37
|
378 #ifdef _WIN32
|
fazekasgy@37
|
379 char *cpfiles = getenv("ProgramFiles");
|
fazekasgy@37
|
380 if (!cpfiles) cpfiles = "C:\\Program Files";
|
fazekasgy@37
|
381 std::string pfiles(cpfiles);
|
fazekasgy@37
|
382 std::string::size_type f;
|
fazekasgy@37
|
383 while ((f = envPath.find("%ProgramFiles%")) != std::string::npos &&
|
fazekasgy@37
|
384 f < envPath.length()) {
|
fazekasgy@37
|
385 envPath.replace(f, 14, pfiles);
|
fazekasgy@37
|
386 }
|
fazekasgy@37
|
387 #endif
|
fazekasgy@37
|
388 }
|
fazekasgy@37
|
389
|
fazekasgy@37
|
390 std::string::size_type index = 0, newindex = 0;
|
fazekasgy@37
|
391
|
fazekasgy@37
|
392 while ((newindex = envPath.find(PATH_SEPARATOR, index)) < envPath.size()) {
|
fazekasgy@37
|
393 path.push_back(envPath.substr(index, newindex - index));
|
fazekasgy@37
|
394 index = newindex + 1;
|
fazekasgy@37
|
395 }
|
fazekasgy@37
|
396
|
fazekasgy@37
|
397 path.push_back(envPath.substr(index));
|
fazekasgy@37
|
398
|
fazekasgy@37
|
399 //can add an extra path for vampy plugins
|
fazekasgy@37
|
400 char* extraPath = getenv("VAMPY_EXTPATH");
|
fazekasgy@37
|
401 if (extraPath) {
|
fazekasgy@37
|
402 string vampyPath(extraPath);
|
fazekasgy@37
|
403 cerr << "VAMPY_EXTPATH=" << vampyPath << endl;
|
fazekasgy@37
|
404 path.push_back(vampyPath);
|
fazekasgy@37
|
405 }
|
fazekasgy@37
|
406
|
fazekasgy@37
|
407 return path;
|
fazekasgy@37
|
408 }
|