Mercurial > hg > svcore

diff data/model/ReadOnlyWaveFileModel.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 efea94b04d5a
children 09751743647e
line wrap: on
line diff
--- a/data/model/ReadOnlyWaveFileModel.h	Tue Dec 13 12:03:48 2016 +0000
+++ b/data/model/ReadOnlyWaveFileModel.h	Tue Dec 13 15:23:21 2016 +0000
@@ -64,9 +64,9 @@
 
     void setStartFrame(sv_frame_t startFrame) { m_startFrame = startFrame; }
 
-    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;
 
@@ -122,7 +122,7 @@
     bool m_exiting;
     static PowerOfSqrtTwoZoomConstraint m_zoomConstraint;
 
-    mutable std::vector<float> m_directRead;
+    mutable floatvec_t m_directRead;
     mutable sv_frame_t m_lastDirectReadStart;
     mutable sv_frame_t m_lastDirectReadCount;
     mutable QMutex m_directReadMutex;