comparison vampy-main.cpp @ 116:c85d26cb9dab vampy-2.3

Add debug print of Vampy release version; update CHANGELOG
author Chris Cannam
date Tue, 26 Feb 2019 14:42:15 +0000
parents 39c5f644152d
children a38d318c85a9
comparison
equal deleted inserted replaced
115:a9e918adfff0 116:c85d26cb9dab
55 #else 55 #else
56 #define pathsep ('/') 56 #define pathsep ('/')
57 #include <dirent.h> 57 #include <dirent.h>
58 #include <dlfcn.h> 58 #include <dlfcn.h>
59 #endif 59 #endif
60
61 #include "version.h"
60 62
61 using std::cerr; 63 using std::cerr;
62 using std::endl; 64 using std::endl;
63 using std::string; 65 using std::string;
64 using std::vector; 66 using std::vector;
197 arrayApiInitialised = true; 199 arrayApiInitialised = true;
198 if (pyModule) Py_XDECREF(pyModule); 200 if (pyModule) Py_XDECREF(pyModule);
199 return; 201 return;
200 202
201 /*HAVE_NUMPY*/ 203 /*HAVE_NUMPY*/
202 #endif 204 #else
203 205 DSTREAM << "Numpy support deselected at compile time, not attempting to initialise it" << endl;
204 numpyInstalled = false; 206 #endif
207
208 numpyInstalled = false;
205 arrayApiInitialised = true; 209 arrayApiInitialised = true;
206 return; 210 return;
207 } 211 }
208 212
209 213
298 const VampPluginDescriptor 302 const VampPluginDescriptor
299 *vampGetPluginDescriptor(unsigned int version,unsigned int index) 303 *vampGetPluginDescriptor(unsigned int version,unsigned int index)
300 { 304 {
301 DSTREAM << "# vampGetPluginDescriptor(" << version << "," << index << ")" << endl; 305 DSTREAM << "# vampGetPluginDescriptor(" << version << "," << index << ")" << endl;
302 306
303 if (version < 1) return 0; 307 if (version < 1) return 0;
304 308
309 DSTREAM << "# Vampy version: " << VAMPY_VERSION << endl;
310
305 int isPythonInitialized = Py_IsInitialized(); 311 int isPythonInitialized = Py_IsInitialized();
306 DSTREAM << "# isPythonInitialized: " << isPythonInitialized << endl; 312 DSTREAM << "# isPythonInitialized: " << isPythonInitialized << endl;
307 DSTREAM << "# haveScannedPlugins: " << haveScannedPlugins << endl; 313 DSTREAM << "# haveScannedPlugins: " << haveScannedPlugins << endl;
308 314
309 if (!haveScannedPlugins) { 315 if (!haveScannedPlugins) {