comparison PyPlugin.cpp @ 27:046ba4183373

Some further mods to vampy construction

 	m_processType(0),
 	m_pyProcess(NULL),
 	m_inputDomain(TimeDomain)
 {	
 	// Create an instance
+	MutexLocker locker(&m_pythonInterpreterMutex);
+	Py_INCREF(m_pyClass);
 	PyObject *pyInputSampleRate = PyFloat_FromDouble(inputSampleRate);
 	PyObject *args = PyTuple_Pack(1, pyInputSampleRate);
-
-	m_pyInstance = PyObject_CallObject(m_pyClass, args);
-
-	if (!m_pyInstance) {
+	m_pyInstance = PyObject_Call(m_pyClass, args, NULL);
+	
+	if (!m_pyInstance || PyErr_Occurred()) { 
+		if (PyErr_Occurred()) { PyErr_Print(); PyErr_Clear(); }
+		Py_CLEAR(args);
+		Py_CLEAR(pyInputSampleRate);
 		cerr << "PyPlugin::PyPlugin: Failed to create Python plugin instance for key \"" << pluginKey << "\" (is the 1-arg class constructor from sample rate correctly provided?)" << endl;
 		throw std::string("Constructor failed");
 	}
-	
+	Py_INCREF(m_pyInstance);
 	Py_DECREF(args);
 	Py_DECREF(pyInputSampleRate);
+
 }
 
 PyPlugin::~PyPlugin()
 {
 	if (m_pyInstance) Py_DECREF(m_pyInstance);
-
-	Py_CLEAR(m_pyProcess);
+	if (m_pyClass) Py_DECREF(m_pyClass);
+	if (m_pyProcess) Py_CLEAR(m_pyProcess);
+
 #ifdef _DEBUG
 	cerr << "PyPlugin::PyPlugin:" << m_class 
 	     << " Instance deleted." << endl;
 #endif
 }

 
 	ParameterList list;
 	ParameterDescriptor pd;
 	char method[]="getParameterDescriptors";
 	cerr << "[call] " << method << endl;
+	
+	if (!m_pyInstance) {cerr << "Error: pyInstance is NULL" << endl; return list;}
 
 	//Check if the method is implemented in Python
 	if ( ! PyObject_HasAttrString(m_pyInstance,method) ) return list;
 			
 		//Call the method: must return list object (new reference)

 					case p::defaultValue:
 						pd.defaultValue = (float) PyFloat_AS_DOUBLE(pyValue);
 						break;
 					case p::isQuantized:
 						pd.isQuantized = (bool) PyInt_AS_LONG(pyValue); 
-						break;									case p::quantizeStep:
+						break;									
+					case p::quantizeStep:
 						pd.quantizeStep = (float) PyFloat_AS_DOUBLE(pyValue);
 						break;
 					default : 	
 						cerr << "Invalid key in Vamp OutputDescriptor: " << PyString_AsString(pyKey) << endl; 
 				}