comparison data/model/ReadOnlyWaveFileModel.h @ 1326:54af1e21705c 3.0-integration

Update to use bqvec allocator for float vectors
author Chris Cannam
date Tue, 13 Dec 2016 15:23:21 +0000
parents efea94b04d5a
children 09751743647e
comparison
equal deleted inserted replaced
1325:3aea4f7617bb 1326:54af1e21705c
62 virtual sv_frame_t getStartFrame() const { return m_startFrame; } 62 virtual sv_frame_t getStartFrame() const { return m_startFrame; }
63 virtual sv_frame_t getEndFrame() const { return m_startFrame + getFrameCount(); } 63 virtual sv_frame_t getEndFrame() const { return m_startFrame + getFrameCount(); }
64 64
65 void setStartFrame(sv_frame_t startFrame) { m_startFrame = startFrame; } 65 void setStartFrame(sv_frame_t startFrame) { m_startFrame = startFrame; }
66 66
67 virtual std::vector<float> getData(int channel, sv_frame_t start, sv_frame_t count) const; 67 virtual floatvec_t getData(int channel, sv_frame_t start, sv_frame_t count) const;
68 68
69 virtual std::vector<std::vector<float>> getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const; 69 virtual std::vector<floatvec_t> getMultiChannelData(int fromchannel, int tochannel, sv_frame_t start, sv_frame_t count) const;
70 70
71 virtual int getSummaryBlockSize(int desired) const; 71 virtual int getSummaryBlockSize(int desired) const;
72 72
73 virtual void getSummaries(int channel, sv_frame_t start, sv_frame_t count, 73 virtual void getSummaries(int channel, sv_frame_t start, sv_frame_t count,
74 RangeBlock &ranges, 74 RangeBlock &ranges,
120 QTimer *m_updateTimer; 120 QTimer *m_updateTimer;
121 sv_frame_t m_lastFillExtent; 121 sv_frame_t m_lastFillExtent;
122 bool m_exiting; 122 bool m_exiting;
123 static PowerOfSqrtTwoZoomConstraint m_zoomConstraint; 123 static PowerOfSqrtTwoZoomConstraint m_zoomConstraint;
124 124
125 mutable std::vector<float> m_directRead; 125 mutable floatvec_t m_directRead;
126 mutable sv_frame_t m_lastDirectReadStart; 126 mutable sv_frame_t m_lastDirectReadStart;
127 mutable sv_frame_t m_lastDirectReadCount; 127 mutable sv_frame_t m_lastDirectReadCount;
128 mutable QMutex m_directReadMutex; 128 mutable QMutex m_directReadMutex;
129 }; 129 };
130 130