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

* Merge from trunk

     ~AggregateWaveModel();
 
     bool isOK() const;
     bool isReady(int *) const;
 
+    QString getTypeName() const { return tr("Aggregate Wave"); }
+
     size_t getComponentCount() const;
     ModelChannelSpec getComponent(size_t c) const;
 
     const ZoomConstraint *getZoomConstraint() const { return &m_zoomConstraint; }
 

     virtual size_t getData(int channel, size_t start, size_t count,
                            float *buffer) const;
 
     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;