comparison layer/SpectrogramLayer.cpp @ 131:eaae73b6bd28

* Suspend/resume fft data server write activity while reading from a server
  to repaint the spectrogram display.  Makes a significant improvement to
  the otherwise dreadful responsiveness of spectrogram display.

 void
 SpectrogramLayer::invalidatePixmapCaches(size_t startFrame, size_t endFrame)
 {
     for (ViewPixmapCache::iterator i = m_pixmapCaches.begin();
          i != m_pixmapCaches.end(); ++i) {
+
         //!!! when are views removed from the map? on setLayerDormant?
         const View *v = i->first;
 
         if (startFrame < v->getEndFrame() && int(endFrame) >= v->getStartFrame()) {
             i->second.validArea = QRect();

 }
 
 void
 SpectrogramLayer::setLayerDormant(const View *v, bool dormant)
 {
-    if (dormant == m_dormancy[v]) return;
-
     if (dormant) {
 
-	m_dormancy[v] = true;
+        if (isLayerDormant(v)) {
+            return;
+        }
+
+        Layer::setLayerDormant(v, true);
 
 	invalidatePixmapCaches();
         m_pixmapCaches.erase(v);
 
         if (m_fftModels.find(v) != m_fftModels.end()) {

             m_fftModels.erase(v);
         }
 	
     } else {
 
-	m_dormancy[v] = false;
+        Layer::setLayerDormant(v, false);
     }
 }
 
 void
 SpectrogramLayer::cacheInvalid()

 	v->setLightBackground(true);
     } else {
 	v->setLightBackground(false);
     }
 
-//    Profiler profiler("SpectrogramLayer::paint", true);
+    Profiler profiler("SpectrogramLayer::paint", true);
 #ifdef DEBUG_SPECTROGRAM_REPAINT
     std::cerr << "SpectrogramLayer::paint(): m_model is " << m_model << ", zoom level is " << v->getZoomLevel() << ", m_updateTimer " << m_updateTimer << std::endl;
     
     std::cerr << "rect is " << rect.x() << "," << rect.y() << " " << rect.width() << "x" << rect.height() << std::endl;
 #endif

 
     // Need to do this even if !isLayerDormant, as that could mean v
     // is not in the dormancy map at all -- we need it to be present
     // and accountable for when determining whether we need the cache
     // in the cache-fill thread above.
-    m_dormancy[v] = false;
+    //!!! no longer use cache-fill thread
+    const_cast<SpectrogramLayer *>(this)->Layer::setLayerDormant(v, false);
 
     size_t fftSize = getFFTSize(v);
     FFTModel *fft = getFFTModel(v);
     if (!fft) {
 	std::cerr << "ERROR: SpectrogramLayer::paint(): No FFT model, returning" << std::endl;

     }
 
     MagnitudeRange overallMag = m_viewMags[v];
     bool overallMagChanged = false;
 
+    fft->suspend();
+
     for (int x = 0; x < w; ++x) {
 
 	for (int y = 0; y < h; ++y) {
 	    ymag[y] = 0.0;
 	    ydiv[y] = 0.0;

     illuminateLocalFeatures(v, paint);
 
 #ifdef DEBUG_SPECTROGRAM_REPAINT
     std::cerr << "SpectrogramLayer::paint() returning" << std::endl;
 #endif
+
+    fft->resume();
 }
 
 void
 SpectrogramLayer::illuminateLocalFeatures(View *v, QPainter &paint) const
 {