Mercurial > hg > svcore

diff data/model/AggregateWaveModel.h @ 1086:9f4505ac9072

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tidy dense time-value model API a bit; add first simple unit test for FFT model
author Chris Cannam
date Wed, 10 Jun 2015 17:06:02 +0100
parents 0fd3661bcfff
children 4d9816ba0ebe
line wrap: on
line diff
--- a/data/model/AggregateWaveModel.h	Wed Jun 10 14:44:09 2015 +0100
+++ b/data/model/AggregateWaveModel.h	Wed Jun 10 17:06:02 2015 +0100
@@ -60,14 +60,11 @@
     virtual sv_frame_t getEndFrame() const { return getFrameCount(); }
 
     virtual sv_frame_t getData(int channel, sv_frame_t start, sv_frame_t count,
-                           float *buffer) const;
+                               float *buffer) const;
 
-    virtual sv_frame_t getData(int channel, sv_frame_t start, sv_frame_t count,
-                           double *buffer) const;
-
-    virtual sv_frame_t getData(int fromchannel, int tochannel,
-                           sv_frame_t start, sv_frame_t count,
-                           float **buffer) const;
+    virtual sv_frame_t getMultiChannelData(int fromchannel, int tochannel,
+                                           sv_frame_t start, sv_frame_t count,
+                                           float **buffer) const;
 
     virtual int getSummaryBlockSize(int desired) const;