diff data/model/AggregateWaveModel.h @ 384:6f6ab834449d spectrogram-cache-rejig

* Merge from trunk

--- a/data/model/AggregateWaveModel.h	Thu Nov 15 14:03:56 2007 +0000
+++ b/data/model/AggregateWaveModel.h	Wed Feb 27 11:59:42 2008 +0000
@@ -42,6 +42,8 @@
     bool isOK() const;
     bool isReady(int *) const;
 
+    QString getTypeName() const { return tr("Aggregate Wave"); }
+
     size_t getComponentCount() const;
     ModelChannelSpec getComponent(size_t c) const;
 
@@ -65,6 +67,12 @@
     virtual size_t getData(int channel, size_t start, size_t count,
                            double *buffer) const;
 
+    virtual size_t getData(size_t fromchannel, size_t tochannel,
+                           size_t start, size_t count,
+                           float **buffer) const;
+
+    virtual size_t getSummaryBlockSize(size_t desired) const;
+
     virtual void getSummaries(size_t channel, size_t start, size_t count,
                               RangeBlock &ranges,
                               size_t &blockSize) const;