Mercurial > hg > svcore

diff data/model/AggregateWaveModel.h @ 383:94fc0591ea43 1.2-stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* merge from trunk (1.2 ended up being tracked from trunk, but we may want this branch for fixes later)
author Chris Cannam
date Wed, 27 Feb 2008 10:32:45 +0000
parents 700cd3350391
children
line wrap: on
line diff
--- a/data/model/AggregateWaveModel.h	Fri Nov 30 17:36:14 2007 +0000
+++ b/data/model/AggregateWaveModel.h	Wed Feb 27 10:32:45 2008 +0000
@@ -67,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;