Mercurial > hg > svcore

diff data/model/AggregateWaveModel.h @ 1096:4d9816ba0ebe simple-fft-model

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rework audio file reader API to prefer using std containers
author Chris Cannam
date Mon, 15 Jun 2015 12:19:47 +0100
parents 9f4505ac9072
children 54af1e21705c
line wrap: on
line diff
--- a/data/model/AggregateWaveModel.h	Sat Jun 13 08:47:05 2015 +0100
+++ b/data/model/AggregateWaveModel.h	Mon Jun 15 12:19:47 2015 +0100
@@ -59,12 +59,9 @@
     virtual sv_frame_t getStartFrame() const { return 0; }
     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;
+    virtual std::vector<float> getData(int channel, sv_frame_t start, sv_frame_t count) const;
 
-    virtual sv_frame_t getMultiChannelData(int fromchannel, int tochannel,
-                                           sv_frame_t start, sv_frame_t count,
-                                           float **buffer) const;
+    virtual std::vector<std::vector<float>> getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const;
 
     virtual int getSummaryBlockSize(int desired) const;