Mercurial > hg > svgui
diff layer/SpectrogramLayer.h @ 907:28d05ae8741c cxx11
More type fixes, primarily in the spectrogram
author | Chris Cannam |
---|---|
date | Tue, 10 Mar 2015 10:31:27 +0000 |
parents | 12ab113ca2b1 |
children | 94e4952a6774 8053c0dfa919 |
line wrap: on
line diff
--- a/layer/SpectrogramLayer.h Mon Mar 09 15:59:04 2015 +0000 +++ b/layer/SpectrogramLayer.h Tue Mar 10 10:31:27 2015 +0000 @@ -310,7 +310,7 @@ { QImage image; QRect validArea; - int startFrame; + sv_frame_t startFrame; int zoomLevel; }; typedef std::map<const View *, ImageCache> ViewImageCache; @@ -334,7 +334,7 @@ void initialisePalette(); void rotatePalette(int distance); - unsigned char getDisplayValue(View *v, float input) const; + unsigned char getDisplayValue(View *v, double input) const; int getColourScaleWidth(QPainter &) const; @@ -428,12 +428,13 @@ void invalidateMagnitudes(); bool updateViewMagnitudes(View *v) const; bool paintDrawBuffer(View *v, int w, int h, - int *binforx, double *binfory, + const std::vector<int> &binforx, + const std::vector<double> &binfory, bool usePeaksCache, MagnitudeRange &overallMag, bool &overallMagChanged) const; bool paintDrawBufferPeakFrequencies(View *v, int w, int h, - int *binforx, + const std::vector<int> &binforx, int minbin, int maxbin, double displayMinFreq,