comparison audioio/AudioGenerator.cpp @ 8:24b500216029

* Refactor sparse models.  Previously the 1D and time-value models duplicated
  a lot of code; now there is a base class (SparseModel) templated on the
  stored point type, and the subclasses define point types with the necessary
  characteristics.

* Add NoteModel, a new SparseModel subclass.

* Reorganise local feature description display.  Instead of asking the layer
  to draw its own, just query it for a textual description and draw that in
  Pane.  Greatly simplifies this part of the layer code.

* Add local feature descriptions to colour 3D plot and waveform layers.

* Add pitch in MIDI-pitch-and-cents to spectrogram layer.

* Give AudioGenerator its own mutex to shorten lock times in CallbackPlaySource.

* Minor adjustments to layers menu &c

     RealTimePluginInstance *instance =
 	factory->instantiatePlugin
 	(pluginId, 0, 0, m_sourceSampleRate, m_pluginBlockSize, m_targetChannelCount);
 
     if (instance) {
+	QMutexLocker locker(&m_mutex);
 	m_synthMap[sodm] = instance;
 	for (unsigned int i = 0; i < instance->getParameterCount(); ++i) {
 	    instance->setParameterValue(i, instance->getParameterDefault(i));
 	}
 	QString program = instance->getProgram(0, 0);

 {
     SparseOneDimensionalModel *sodm =
 	dynamic_cast<SparseOneDimensionalModel *>(model);
     if (!sodm) return; // nothing to do
 
+    QMutexLocker locker(&m_mutex);
+
     if (m_synthMap.find(sodm) == m_synthMap.end()) return;
 
     RealTimePluginInstance *instance = m_synthMap[sodm];
     m_synthMap.erase(sodm);
     delete instance;
 }
 
 void
 AudioGenerator::clearModels()
 {
+    QMutexLocker locker(&m_mutex);
     while (!m_synthMap.empty()) {
 	RealTimePluginInstance *instance = m_synthMap.begin()->second;
 	m_synthMap.erase(m_synthMap.begin());
 	delete instance;
     }
 }    
 
 void
 AudioGenerator::reset()
 {
+    QMutexLocker locker(&m_mutex);
     for (PluginMap::iterator i = m_synthMap.begin(); i != m_synthMap.end(); ++i) {
 	if (i->second) {
 	    i->second->silence();
 	    i->second->discardEvents();
 	}

 }
 
 void
 AudioGenerator::setTargetChannelCount(size_t targetChannelCount)
 {
+    QMutexLocker locker(&m_mutex);
     m_targetChannelCount = targetChannelCount;
 
     for (PluginMap::iterator i = m_synthMap.begin(); i != m_synthMap.end(); ++i) {
 	if (i->second) i->second->setIdealChannelCount(targetChannelCount);
     }

 {
     if (m_sourceSampleRate == 0) {
 	std::cerr << "WARNING: AudioGenerator::mixModel: No base source sample rate available" << std::endl;
 	return frameCount;
     }
+
+    QMutexLocker locker(&m_mutex);
 
     PlayParameters *parameters = m_viewManager->getPlayParameters(model);
     if (!parameters) return frameCount;
 
     bool playing = !parameters->isPlayMuted();