Mercurial > hg > svgui

diff layer/SpectrogramLayer.h @ 988:4f4f0e158ecf 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch simple-fft-model
author Chris Cannam
date Wed, 01 Jul 2015 13:27:03 +0100
parents 98827470ada2 8053c0dfa919
children 2bd5eb6a6c6b
line wrap: on
line diff
--- a/layer/SpectrogramLayer.h	Wed Jul 01 13:21:08 2015 +0100
+++ b/layer/SpectrogramLayer.h	Wed Jul 01 13:27:03 2015 +0100
@@ -246,8 +246,6 @@
     
     void preferenceChanged(PropertyContainer::PropertyName name);
 
-    void fillTimerTimedOut();
-
 protected:
     const DenseTimeValueModel *m_model; // I do not own this
 
@@ -323,9 +321,6 @@
      */
     mutable QImage m_drawBuffer;
 
-    mutable QTimer *m_updateTimer;
-
-    mutable sv_frame_t m_candidateFillStartFrame;
     bool m_exiting;
 
     void initialisePalette();
@@ -370,8 +365,7 @@
     Dense3DModelPeakCache *getPeakCache(const LayerGeometryProvider *v) const;
     void invalidateFFTModels();
 
-    typedef std::pair<FFTModel *, sv_frame_t> FFTFillPair; // model, last fill
-    typedef std::map<const View *, FFTFillPair> ViewFFTMap;
+    typedef std::map<const View *, FFTModel *> ViewFFTMap;
     typedef std::map<const View *, Dense3DModelPeakCache *> PeakCacheMap;
     mutable ViewFFTMap m_fftModels;
     mutable PeakCacheMap m_peakCaches;