diff layer/SpectrogramLayer.h @ 115:47cb32bb35ab

* Restore progress updates to spectrogram
author Chris Cannam
date Wed, 05 Jul 2006 16:15:22 +0000
parents 991de8783cf5
children 508276c923ba
line wrap: on
line diff
--- a/layer/SpectrogramLayer.h	Fri Jun 30 11:26:10 2006 +0000
+++ b/layer/SpectrogramLayer.h	Wed Jul 05 16:15:22 2006 +0000
@@ -186,7 +186,7 @@
     float getYForFrequency(View *v, float frequency) const;
     float getFrequencyForY(View *v, int y) const;
 
-    virtual int getCompletion() const;
+    virtual int getCompletion(View *v) const;
 
     virtual bool getValueExtents(float &min, float &max,
                                  bool &logarithmic, QString &unit) const;
@@ -264,7 +264,6 @@
     mutable QTimer *m_updateTimer;
 
     mutable size_t m_candidateFillStartFrame;
-    mutable size_t m_lastFillExtent;
     bool m_exiting;
 
     void setColourmap();
@@ -313,7 +312,9 @@
     size_t getFFTSize(const View *v) const;
     FFTFuzzyAdapter *getFFTAdapter(const View *v) const;
     void invalidateFFTAdapters();
-    typedef std::map<const View *, FFTFuzzyAdapter *> ViewFFTMap;
+
+    typedef std::pair<FFTFuzzyAdapter *, int> FFTFillPair; // adapter, last fill
+    typedef std::map<const View *, FFTFillPair> ViewFFTMap;
     mutable ViewFFTMap m_fftAdapters;
 };