comparison PyPlugin.h @ 51:c1e4f706ca9a

Fix numpy version incompatibility issues and updated some example plugins.

 	};
 
 class PyPlugin : public Vamp::Plugin
 {
 public:
-	PyPlugin(std::string plugin,float inputSampleRate, PyObject *pyClass, int &instcount);
+	PyPlugin(std::string plugin,float inputSampleRate, PyObject *pyClass, int &instcount, bool &numpyInstalled);
 	virtual ~PyPlugin();
 
 	bool initialise(size_t channels, size_t stepSize, size_t blockSize);
 	void reset();
 

 	PyTypeInterface m_ti;
 	int m_vampyFlags;
 	bool m_quitOnErrorFlag;
 	bool m_debugFlag;
 	bool m_useRealTimeFlag;
+	bool m_numpyInstalled;
+	mutable bool m_processFailure;
 
 	void setProcessType();
 	
 	FeatureSet processMethodCall(const float *const *inputBuffers,Vamp::RealTime timestamp);
 
 	bool getBooleanFlag(char flagName[],bool) const;
 	int getBinaryFlags(char flagName[], eVampyFlags) const;
-	void typeErrorHandler(char *method) const;
+	void typeErrorHandler(char *method, bool process = false) const;
 
 	/// simple 'void return' call with no args
 	void genericMethodCall(char *method) const
 	{
 		if (m_debugFlag) cerr << DEBUG_NAME << endl;

 
 /// optimised process call
 inline PyPlugin::FeatureSet
 PyPlugin::processMethodCall(const float *const *inputBuffers,Vamp::RealTime timestamp)
 {
-	
+
 	/// Optimizations: 1) we avoid ...ObjArg functions since we know
 	/// the number of arguments, and we don't like va_list parsing 
 	/// in the process. 2) Also: we're supposed to incref args, 
 	/// but instead, we let the arguments tuple steal the references
 	/// and decref them when it is deallocated.

 	
 	FeatureSet rFeatureSet;
 	PyObject *pyChannelList = NULL;
 
 	if (m_processType == numpy_bufferProcess) {
-		pyChannelList = m_ti.InputBuffers_As_SharedMemoryList(inputBuffers,m_channels,m_blockSize,m_inputDomain);
+		pyChannelList = m_ti.InputBuffers_As_SharedMemoryList(
+				inputBuffers,m_channels,m_blockSize,m_inputDomain);
 	} 
 
 	if (m_processType == legacyProcess) {
-		pyChannelList = m_ti.InputBuffers_As_PythonLists(inputBuffers,m_channels,m_blockSize,m_inputDomain);
+		pyChannelList = m_ti.InputBuffers_As_PythonLists(
+			inputBuffers,m_channels,m_blockSize,m_inputDomain);
 	}
 
 #ifdef HAVE_NUMPY
 	if (m_processType == numpy_arrayProcess) {
-		pyChannelList = m_ti.InputBuffers_As_NumpyArray(inputBuffers,m_channels,m_blockSize,m_inputDomain);
+		pyChannelList = m_ti.InputBuffers_As_NumpyArray(
+			inputBuffers,m_channels,m_blockSize,m_inputDomain);
 	}
 #endif
 
 /// we don't expect these to fail unless out of memory (which is very unlikely on modern systems)
 #ifdef _DEBUG

 	rFeatureSet = m_ti.PyValue_To_FeatureSet(pyValue);
 	if (!m_ti.error) {
 		Py_DECREF(pyValue);
 		Py_DECREF(pyArgs);
 	} else {
-		typeErrorHandler(PyString_AsString(m_pyProcess));
+		typeErrorHandler(PyString_AsString(m_pyProcess),true);
 		Py_CLEAR(pyValue);
 		Py_CLEAR(pyArgs);
 	}
 	return rFeatureSet;
 }