comparison layer/WaveformLayer.h @ 949:e3c7da3d896e osx-retina

Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 11:00:48 +0100
parents 4fe7a09be0fe e53a87a5efb2
children a34a2a25907c
comparison
equal deleted inserted replaced
948:8bf05426d950 949:e3c7da3d896e
200 200
201 virtual int getVerticalZoomSteps(int &defaultStep) const; 201 virtual int getVerticalZoomSteps(int &defaultStep) const;
202 virtual int getCurrentVerticalZoomStep() const; 202 virtual int getCurrentVerticalZoomStep() const;
203 virtual void setVerticalZoomStep(int); 203 virtual void setVerticalZoomStep(int);
204 204
205 virtual bool canExistWithoutModel() const { return true; }
206
205 protected: 207 protected:
206 int dBscale(double sample, int m) const; 208 int dBscale(double sample, int m) const;
207 209
208 const RangeSummarisableTimeValueModel *m_model; // I do not own this 210 const RangeSummarisableTimeValueModel *m_model; // I do not own this
209 211