Mercurial > hg > svgui

diff layer/WaveformLayer.h @ 810:b68af2be4545 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:42:25 +0100
parents 1d526ba11a24
children b66fb15de477
line wrap: on
line diff
--- a/layer/WaveformLayer.h	Mon Jun 16 12:50:27 2014 +0100
+++ b/layer/WaveformLayer.h	Wed Jun 18 13:42:25 2014 +0100
@@ -208,15 +208,15 @@
     const RangeSummarisableTimeValueModel *m_model; // I do not own this
 
     /// Return value is number of channels displayed
-    size_t getChannelArrangement(size_t &min, size_t &max,
+    int getChannelArrangement(int &min, int &max,
                                  bool &merging, bool &mixing) const;
 
-    int getYForValue(const View *v, float value, size_t channel) const;
+    int getYForValue(const View *v, float value, int channel) const;
 
-    float getValueForY(const View *v, int y, size_t &channel) const;
+    float getValueForY(const View *v, int y, int &channel) const;
 
-    bool getSourceFramesForX(View *v, int x, size_t modelZoomLevel,
-                             size_t &f0, size_t &f1) const;
+    bool getSourceFramesForX(View *v, int x, int modelZoomLevel,
+                             int &f0, int &f1) const;
 
     float getNormalizeGain(View *v, int channel) const;