Mercurial > hg > svgui

changeset 975:b8187c83b93a simple-fft-model

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Gut the old code, but don't replace it yet (so nothing will link yet)
author Chris Cannam
date Fri, 12 Jun 2015 14:51:46 +0100
parents 6645b6b8356f
children f2c63ec85901 f40ccbf228c2 8053c0dfa919
files layer/SpectrogramLayer.cpp layer/SpectrumLayer.cpp
diffstat 2 files changed, 2 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/layer/SpectrogramLayer.cpp	Fri Jun 12 12:24:21 2015 +0100
+++ b/layer/SpectrogramLayer.cpp	Fri Jun 12 14:51:46 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
--- a/layer/SpectrumLayer.cpp	Fri Jun 12 12:24:21 2015 +0100
+++ b/layer/SpectrumLayer.cpp	Fri Jun 12 14:51:46 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;
 }