comparison data/model/AggregateWaveModel.h @ 1365:3382d914e110

Merge from branch 3.0-integration
author Chris Cannam
date Fri, 13 Jan 2017 10:29:44 +0000
parents 54af1e21705c
children 770f80d9ccee
comparison
equal deleted inserted replaced
1272:6a7ea3bd0e10 1365:3382d914e110
57 float getValueMaximum() const { return 1.0f; } 57 float getValueMaximum() const { return 1.0f; }
58 58
59 virtual sv_frame_t getStartFrame() const { return 0; } 59 virtual sv_frame_t getStartFrame() const { return 0; }
60 virtual sv_frame_t getEndFrame() const { return getFrameCount(); } 60 virtual sv_frame_t getEndFrame() const { return getFrameCount(); }
61 61
62 virtual sv_frame_t getData(int channel, sv_frame_t start, sv_frame_t count, 62 virtual floatvec_t getData(int channel, sv_frame_t start, sv_frame_t count) const;
63 float *buffer) const;
64 63
65 virtual sv_frame_t getMultiChannelData(int fromchannel, int tochannel, 64 virtual std::vector<floatvec_t> getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const;
66 sv_frame_t start, sv_frame_t count,
67 float **buffer) const;
68 65
69 virtual int getSummaryBlockSize(int desired) const; 66 virtual int getSummaryBlockSize(int desired) const;
70 67
71 virtual void getSummaries(int channel, sv_frame_t start, sv_frame_t count, 68 virtual void getSummaries(int channel, sv_frame_t start, sv_frame_t count,
72 RangeBlock &ranges, 69 RangeBlock &ranges,