comparison data/model/AggregateWaveModel.h @ 1126:39019ce29178 tony-2.0-integration

Merge through to branch for Tony 2.0
author Chris Cannam
date Thu, 20 Aug 2015 14:54:21 +0100
parents 4d9816ba0ebe
children 54af1e21705c
comparison
equal deleted inserted replaced
1119:e22bfe8ca248 1126:39019ce29178
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 std::vector<float> getData(int channel, sv_frame_t start, sv_frame_t count) const;
63 float *buffer) const;
64 63
65 virtual sv_frame_t getData(int channel, sv_frame_t start, sv_frame_t count, 64 virtual std::vector<std::vector<float>> getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const;
66 double *buffer) const;
67
68 virtual sv_frame_t getData(int fromchannel, int tochannel,
69 sv_frame_t start, sv_frame_t count,
70 float **buffer) const;
71 65
72 virtual int getSummaryBlockSize(int desired) const; 66 virtual int getSummaryBlockSize(int desired) const;
73 67
74 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,
75 RangeBlock &ranges, 69 RangeBlock &ranges,