comparison audioio/AudioCallbackPlaySource.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

 }
 
 void
 AudioCallbackPlaySource::addModel(Model *model)
 {
+    m_audioGenerator->addModel(model);
+
     m_mutex.lock();
 
     m_models.insert(model);
     if (model->getEndFrame() > m_lastModelEndFrame) {
 	m_lastModelEndFrame = model->getEndFrame();

 
     if (!m_writeBuffers || m_writeBuffers->size() < modelChannels) {
 	m_audioGenerator->setTargetChannelCount(modelChannels);
     }
 
-    m_audioGenerator->addModel(model);
-
     if (!m_writeBuffers || (m_writeBuffers->size() < modelChannels)) {
 	clearRingBuffers(true, modelChannels);
 	buffersChanged = true;
     } else {
 	clearRingBuffers(true);

 	 i != m_models.end(); ++i) {
 	if ((*i)->getEndFrame() > lastEnd) lastEnd = (*i)->getEndFrame();
     }
     m_lastModelEndFrame = lastEnd;
 
+    m_mutex.unlock();
+
     m_audioGenerator->removeModel(model);
-
-    m_mutex.unlock();
 
     clearRingBuffers();
 }
 
 void

 	m_converter = 0;
     }
 
     m_lastModelEndFrame = 0;
 
+    m_sourceSampleRate = 0;
+
+    m_mutex.unlock();
+
     m_audioGenerator->clearModels();
-
-    m_sourceSampleRate = 0;
-
-    m_mutex.unlock();
 }    
 
 void
 AudioCallbackPlaySource::clearRingBuffers(bool haveLock, size_t count)
 {

     std::cerr << "AudioCallbackPlaySource::clearRingBuffers: Created "
 	      << count << " write buffers" << std::endl;
 
     if (!haveLock) {
 	m_mutex.unlock();
-	m_condition.wakeAll();
+//!!!	m_condition.wakeAll();
     }
 }
 
 void
 AudioCallbackPlaySource::play(size_t startFrame)