comparison plugin/DSSIPluginInstance.cpp @ 980:6e6da0636e5e tonioni

Merge from default branch

 				       int idealChannelCount,
 				       const DSSI_Descriptor* descriptor) :
     RealTimePluginInstance(factory, identifier),
     m_client(clientId),
     m_position(position),
+    m_instanceHandle(0),
     m_descriptor(descriptor),
     m_programCacheValid(false),
     m_eventBuffer(EVENT_BUFFER_SIZE),
     m_blockSize(blockSize),
     m_idealChannelCount(idealChannelCount),

 DSSIPluginInstance::ParameterList
 DSSIPluginInstance::getParameterDescriptors() const
 {
     ParameterList list;
     LADSPAPluginFactory *f = dynamic_cast<LADSPAPluginFactory *>(m_factory);
+    if (!f) return list;
     
     for (unsigned int i = 0; i < m_controlPortsIn.size(); ++i) {
         
         ParameterDescriptor pd;
         unsigned int pn = m_controlPortsIn[i].first;

     int evCount = 0;
 
     if (count == 0) count = m_blockSize;
 
     bool needLock = false;
-    if (m_descriptor->select_program) needLock = true;
+    if (m_descriptor && m_descriptor->select_program) needLock = true;
 
     if (needLock) {
 	if (!m_processLock.tryLock()) {
 	    for (size_t ch = 0; ch < m_audioPortsOut.size(); ++ch) {
 		memset(m_outputBuffers[ch], 0, m_blockSize * sizeof(sample_t));

     }
 
     if (!m_descriptor || !m_descriptor->run_synth) {
 	m_eventBuffer.skip(m_eventBuffer.getReadSpace());
 	m_haveLastEventSendTime = false;
-	if (m_descriptor->LADSPA_Plugin->run) {
+	if (m_descriptor && m_descriptor->LADSPA_Plugin->run) {
 	    m_descriptor->LADSPA_Plugin->run(m_instanceHandle, count);
 	} else {
 	    for (size_t ch = 0; ch < m_audioPortsOut.size(); ++ch) {
 		memset(m_outputBuffers[ch], 0, m_blockSize * sizeof(sample_t));
 	    }