Mercurial > hg > svcore

diff data/model/AggregateWaveModel.h @ 1326:54af1e21705c 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to use bqvec allocator for float vectors
author Chris Cannam
date Tue, 13 Dec 2016 15:23:21 +0000
parents 4d9816ba0ebe
children 770f80d9ccee
line wrap: on
line diff
--- a/data/model/AggregateWaveModel.h	Tue Dec 13 12:03:48 2016 +0000
+++ b/data/model/AggregateWaveModel.h	Tue Dec 13 15:23:21 2016 +0000
@@ -59,9 +59,9 @@
     virtual sv_frame_t getStartFrame() const { return 0; }
     virtual sv_frame_t getEndFrame() const { return getFrameCount(); }
 
-    virtual std::vector<float> getData(int channel, sv_frame_t start, sv_frame_t count) const;
+    virtual floatvec_t getData(int channel, sv_frame_t start, sv_frame_t count) const;
 
-    virtual std::vector<std::vector<float>> getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const;
+    virtual std::vector<floatvec_t> getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const;
 
     virtual int getSummaryBlockSize(int desired) const;