# HG changeset patch
# User Chris Cannam
# Date 1435324218 -3600
# Node ID f40ccbf228c221d5d6b2b83fad09f62bc7bd64b3
# Parent  6645b6b8356f81bd2a611f8539d1f034ae129009# Parent  b8187c83b93aa9de7eb0a3718a1488a2c8cdf4ae
Merge from branch simple-fft-model

diff -r 6645b6b8356f -r f40ccbf228c2 layer/SpectrogramLayer.cpp
--- a/layer/SpectrogramLayer.cpp	Fri Jun 12 12:24:21 2015 +0100
+++ b/layer/SpectrogramLayer.cpp	Fri Jun 26 14:10:18 2015 +0100
@@ -1629,10 +1629,7 @@
                                        m_windowType,
                                        m_windowSize,
                                        getWindowIncrement(),
-                                       fftSize,
-                                       true, // polar
-                                       StorageAdviser::SpeedCritical,
-                                       m_candidateFillStartFrame);
+                                       fftSize);
 
         if (!model->isOK()) {
             QMessageBox::critical
@@ -1654,8 +1651,6 @@
 
         m_fftModels[v] = FFTFillPair(model, 0);
 
-        model->resume();
-        
         delete m_updateTimer;
         m_updateTimer = new QTimer((SpectrogramLayer *)this);
         connect(m_updateTimer, SIGNAL(timeout()),
@@ -2445,8 +2440,6 @@
         (void)gettimeofday(&tv, 0);
         m_lastPaintTime = RealTime::fromTimeval(tv) - mainPaintStart;
     }
-
-//!!!    if (fftSuspended) fft->resume();
 }
 
 bool
diff -r 6645b6b8356f -r f40ccbf228c2 layer/SpectrumLayer.cpp
--- a/layer/SpectrumLayer.cpp	Fri Jun 12 12:24:21 2015 +0100
+++ b/layer/SpectrumLayer.cpp	Fri Jun 26 14:10:18 2015 +0100
@@ -112,11 +112,7 @@
                                     m_windowType,
                                     m_windowSize,
                                     getWindowIncrement(),
-                                    m_windowSize,
-                                    false,
-                                    StorageAdviser::Criteria
-                                    (StorageAdviser::SpeedCritical |
-                                     StorageAdviser::FrequentLookupLikely));
+                                    m_windowSize);
 
     setSliceableModel(newFFT);
 
@@ -125,8 +121,6 @@
         m_biasCurve.push_back(1.f / (float(m_windowSize)/2.f));
     }
 
-    newFFT->resume();
-
     m_newFFTNeeded = false;
 }