# HG changeset patch
# User Chris Cannam
# Date 1161092971 0
# Node ID 86cee2b060c73e7bd869883aa179a224f01d5444
# Parent  d4be66d61c045c40e9421c8277164d2f422cd7db
* Fix slowness in serving FFT values to feature extraction plugin transform
  (failure to call resume() on FFT model)
* Fix failure to update completion from time/value model

diff -r d4be66d61c04 -r 86cee2b060c7 layer/SpectrogramLayer.cpp
--- a/layer/SpectrogramLayer.cpp	Tue Oct 17 13:04:49 2006 +0000
+++ b/layer/SpectrogramLayer.cpp	Tue Oct 17 13:49:31 2006 +0000
@@ -1583,16 +1583,19 @@
     }
 
     if (m_fftModels.find(v) == m_fftModels.end()) {
-        m_fftModels[v] = FFTFillPair
-            (new FFTModel(m_model,
-                          m_channel,
-                          m_windowType,
-                          m_windowSize,
-                          getWindowIncrement(),
-                          fftSize,
-                          true,
-                          m_candidateFillStartFrame),
-             0);
+
+        FFTModel *model = new FFTModel(m_model,
+                                       m_channel,
+                                       m_windowType,
+                                       m_windowSize,
+                                       getWindowIncrement(),
+                                       fftSize,
+                                       true,
+                                       m_candidateFillStartFrame);
+
+        m_fftModels[v] = FFTFillPair(model, 0);
+
+        model->resume();
         
         delete m_updateTimer;
         m_updateTimer = new QTimer((SpectrogramLayer *)this);
diff -r d4be66d61c04 -r 86cee2b060c7 layer/TimeValueLayer.h
--- a/layer/TimeValueLayer.h	Tue Oct 17 13:04:49 2006 +0000
+++ b/layer/TimeValueLayer.h	Tue Oct 17 13:49:31 2006 +0000
@@ -102,7 +102,7 @@
 
     virtual bool isLayerEditable() const { return true; }
 
-    virtual int getCompletion() const { return m_model->getCompletion(); }
+    virtual int getCompletion(View *) const { return m_model->getCompletion(); }
 
     virtual bool needsTextLabelHeight() const {
         return m_plotStyle == PlotSegmentation && m_model->hasTextLabels();
diff -r d4be66d61c04 -r 86cee2b060c7 view/View.cpp
--- a/view/View.cpp	Tue Oct 17 13:04:49 2006 +0000
+++ b/view/View.cpp	Tue Oct 17 13:49:31 2006 +0000
@@ -1087,8 +1087,6 @@
 
 		i->second->setText(i->first->getPropertyContainerName());
 
-//                std::cerr << this << "::checkProgress: completion " << completion << std::endl;
-
 		i->second->setValue(completion);
 		i->second->move(0, ph - i->second->height());