comparison layer/WaveformLayer.h @ 908:4a578a360011 cxx11

More type fixes
author Chris Cannam
date Tue, 10 Mar 2015 13:22:10 +0000
parents b66fb15de477
children 94e4952a6774 e53a87a5efb2
comparison
equal deleted inserted replaced
907:28d05ae8741c 908:4a578a360011
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 protected: 205 protected:
206 int dBscale(float sample, int m) const; 206 int dBscale(double sample, int m) const;
207 207
208 const RangeSummarisableTimeValueModel *m_model; // I do not own this 208 const RangeSummarisableTimeValueModel *m_model; // I do not own this
209 209
210 /// Return value is number of channels displayed 210 /// Return value is number of channels displayed
211 int getChannelArrangement(int &min, int &max, 211 int getChannelArrangement(int &min, int &max,
214 int getYForValue(const View *v, double value, int channel) const; 214 int getYForValue(const View *v, double value, int channel) const;
215 215
216 double getValueForY(const View *v, int y, int &channel) const; 216 double getValueForY(const View *v, int y, int &channel) const;
217 217
218 bool getSourceFramesForX(View *v, int x, int modelZoomLevel, 218 bool getSourceFramesForX(View *v, int x, int modelZoomLevel,
219 int &f0, int &f1) const; 219 sv_frame_t &f0, sv_frame_t &f1) const;
220 220
221 float getNormalizeGain(View *v, int channel) const; 221 float getNormalizeGain(View *v, int channel) const;
222 222
223 virtual void flagBaseColourChanged() { m_cacheValid = false; } 223 virtual void flagBaseColourChanged() { m_cacheValid = false; }
224 224