comparison vampy-main.cpp @ 67:146d14ab15e7

Debug output: off by default, on with VAMPY_VERBOSE environment variable

 #include "vamp-sdk/PluginAdapter.h"
 #include "PyPlugScanner.h"
 #include "PyPlugin.h"
 #include "PyExtensionModule.h"
 #include "PyExtensionManager.h"
+#include "Debug.h"
 #include <sstream>
 
 #ifdef _WIN32
 #define pathsep ('\\')
 #include <windows.h>

         PluginAdapterBase(),
         m_plug(pyPlugId),		
         m_pyClass(pyClass),
 		m_failed(false)
     { 
-        cerr << "PyPluginAdapter:ctor:"<< adinstcount << ": " << m_plug << endl; 
+        DSTREAM << "PyPluginAdapter:ctor:"<< adinstcount << ": " << m_plug << endl; 
         adinstcount++;
     }
     
     ~PyPluginAdapter() 
     {

     {
         try {
             PyPlugin *plugin = new PyPlugin(m_plug, inputSampleRate, m_pyClass, totinstcount, numpyInstalled);
             return plugin;
         } catch (...) {
-            cerr << "PyPluginAdapter::createPlugin: Failed to construct PyPlugin" << endl;
-			// any plugin with syntax errors will fail to construct
-			m_failed = true;
+            cerr << "ERROR: PyPluginAdapter::createPlugin: Failed to construct PyPlugin" << endl;
+	    // any plugin with syntax errors will fail to construct
+	    m_failed = true;
             return 0;
         }
     }
     
     std::string m_plug;

 	string ver;
 	std::istringstream verStream;
 	float numpyVersion;
 
 	/// attmept to test numpy version before importing the array API
-	cerr << "Numpy build information: ABI level: " << NPY_VERSION 
-	<< " Numpy version: " << NUMPY_SHORTVERSION << endl;
+	DSTREAM << "Numpy build information: ABI level: " << NPY_VERSION 
+		<< " Numpy version: " << NUMPY_SHORTVERSION << endl;
 	
 	PyObject *pyModule, *pyDict, *pyVer;
 	
 	pyModule = PyImport_ImportModule("numpy"); //numpy.core.multiarray
 	if (!pyModule) {
-		cerr << "Vampy was compiled with Numpy support but Numpy does not seem to be installed." << endl;
+		cerr << "ERROR: Vampy was compiled with Numpy support but Numpy does not seem to be installed." << endl;
 #ifdef __APPLE__
 		cerr << "Hint: Check if Numpy is installed for the particular setup of Python used by Vampy (given by Python exec prefix)." << endl;
 #endif		
 		goto numpyFailure;
 	}
 
 	pyDict = PyModule_GetDict(pyModule); // borrowed ref
 	if (!pyDict) {
-		cerr << "Can not access Numpy module dictionary." << endl;
+		cerr << "ERROR: Can not access Numpy module dictionary." << endl;
 		goto numpyFailure;
 	}
 
 	pyVer = PyDict_GetItemString(pyDict,"__version__"); //borrowed ref
 	if (!pyVer) {
-		cerr << "Can not access Numpy version information." << endl;
+		cerr << "ERROR: Can not access Numpy version information." << endl;
 		goto numpyFailure;
 	}
 
 	ver = PyString_AsString(pyVer);
 	ver = ver.substr(0,ver.rfind("."));
-	/*
-	Applied patch from here: http://vamp-plugins.org/forum/index.php/topic,162.msg387.html#msg387 to replace this:
-    if(EOF == sscanf(ver.c_str(), "%f", &numpyVersion))
-    {
-     cerr << "Could not parse Numpy version information." << endl;
-     goto numpyFailure;
-    }*/
+
 	// parse version string to float
-    verStream.str(ver);
-    verStream >> numpyVersion;
-
-	cerr << "Numpy runtime version: " << numpyVersion << endl;
+	verStream.str(ver);
+	verStream >> numpyVersion;
+
+	DSTREAM << "Numpy runtime version: " << numpyVersion << endl;
 	if (numpyVersion < (float) NUMPY_SHORTVERSION) {
-		cerr << "Incompatible Numpy version found: " << numpyVersion << endl;
+		cerr << "ERROR: Incompatible Numpy version found: " << numpyVersion << endl;
 		goto numpyFailure;
 	}
 
 	Py_DECREF(pyModule);
 
 	// At least we catch import errors, but if binary compatibility
 	// has changed without notice, this would still fail.
 	// However, we should never get to this point now anyway.
 	import_array();
 	if (PyErr_Occurred()) { 
-		cerr << "Import error while loading the Numpy Array API." << endl;
+		cerr << "ERROR: Import error while loading the Numpy Array API." << endl;
 		PyErr_Print(); PyErr_Clear(); 
 		goto numpyFailure;
 	}
 	else {
-
-#ifdef _DEBUG		
-		if (NPY_VERSION != PyArray_GetNDArrayCVersion()) {  
-			// the Import function does this check already.
-			cerr << "Warning: Numpy version mismatch. (Build version: " 
-				<< NPY_VERSION << " Runtime version: " << PyArray_GetNDArrayCVersion() << ")" << endl;
-			goto numpyFailure; 
-		}
-#endif
-
 		numpyInstalled = true;
 		arrayApiInitialised = true;
 		return;
   	}
 

     if (!lib) {
         //perror("dlopen");
         return false;
     }
 #endif
-    cerr << "Preloaded Python from " << name << endl;
+    DSTREAM << "Preloaded Python from " << name << endl;
     return true;
 }
 
 static bool preloadPython()
 {

                 shortver = pyver.substr(0, i);
                 break;
             }
         }
     }
-    cerr << "Short version: " << shortver << endl;
-	// this is useful to find out where the loaded library might be loaded from
-	cerr << "Python exec prefix: " << Py_GetExecPrefix() << endl;
+    DSTREAM << "Short version: " << shortver << endl;
+    // this is useful to find out where the loaded library might be loaded from
+    DSTREAM << "Python exec prefix: " << Py_GetExecPrefix() << endl;
 
     char *pylib = getenv("VAMPY_PYLIB");
     if (pylib && *pylib) {
-        cerr << "Trying to preload Python from specified location " << pylib
-	    << "..." << endl;
+        DSTREAM << "Trying to preload Python from specified location " << pylib
+		<< "..." << endl;
         return tryPreload(string(pylib));
     } 
 
     vector<string> pfxs;
     pfxs.push_back(string(Py_GetExecPrefix()) + "/");

 *vampGetPluginDescriptor(unsigned int version,unsigned int index)
 {	
     if (version < 1) return 0;
 
 	int isPythonInitialized = Py_IsInitialized();
-	cerr << "# isPythonInitialized: " << isPythonInitialized << endl;
-	cerr << "# haveScannedPlugins: " << haveScannedPlugins << endl;
+	DSTREAM << "# isPythonInitialized: " << isPythonInitialized << endl;
+	DSTREAM << "# haveScannedPlugins: " << haveScannedPlugins << endl;
 
 	if (!haveScannedPlugins) {
 
 		if (!isPythonInitialized){
 

 			if (PyImport_AppendInittab("vampy",initvampy) != 0)
 				cerr << "Warning: Extension module could not be added to module inittab." << endl;
 			Py_Initialize();
 			array_API_initialiser();
 			initvampy();
-#ifdef _DEBUG			
-		    cerr << "# isPythonInitialized after initialize: " << Py_IsInitialized() << endl;
-#endif		
+			DSTREAM << "# isPythonInitialized after initialize: " << Py_IsInitialized() << endl;
 		}
 
 		vector<string> pyPlugs;
 		vector<string> pyPath;
 		vector<PyObject *> pyClasses;
 		static PyPlugScanner *scanner;
 		
 		//Scanning Plugins
-		cerr << "Scanning Vampy Plugins" << endl;
+		DSTREAM << "Scanning Vampy Plugins" << endl;
 		scanner = PyPlugScanner::getInstance();
 
 		// added env. varable support VAMPY_EXTPATH
 		pyPath=scanner->getAllValidPath();
 		scanner->setPath(pyPath);
 		
 		// added env. variable support: 
 		// VAMPY_COMPILED=1 to recognise .pyc files (default is 1)
 		pyPlugs = scanner->getPyPlugs();
 
-		cerr << "Found " << pyPlugs.size() << " Scripts." << endl;
+		DSTREAM << "Found " << pyPlugs.size() << " Scripts." << endl;
 		//TODO: should this support multiple classes per script (?)
 		pyClasses = scanner->getPyClasses();
-		cerr << "Found " << pyClasses.size() << " Classes." << endl;
+		DSTREAM << "Found " << pyClasses.size() << " Classes." << endl;
 
 		for (size_t i = 0; i < pyPlugs.size(); ++i) {
 			adapters.push_back( new PyPluginAdapter(pyPlugs[i],pyClasses[i]));
 		}
 		pyExtensionManager.setPlugModuleNames(pyPlugs);
 		pyExtensionManager.initExtension();
 		array_API_initialiser();
 		haveScannedPlugins=true;
 	}
 
-#ifdef _DEBUG
-	cerr << "Accessing adapter index: " << index << " (adapters: " << adapters.size() << ")" << endl;
-#endif	
+	DSTREAM << "Accessing adapter index: " << index << " (adapters: " << adapters.size() << ")" << endl;
 
 	if (index<adapters.size()) {
 
 		const VampPluginDescriptor *tmp = adapters[index]->getDescriptor();