comparison layer/WaveformLayer.h @ 811:c4ef666721bf

Merge from branch warnfix_no_size_t

     int dBscale(float sample, int m) const;
 
     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;
-
-    float getValueForY(const View *v, int y, size_t &channel) const;
-
-    bool getSourceFramesForX(View *v, int x, size_t modelZoomLevel,
-                             size_t &f0, size_t &f1) const;
+    int getYForValue(const View *v, float value, int channel) const;
+
+    float getValueForY(const View *v, int y, int &channel) const;
+
+    bool getSourceFramesForX(View *v, int x, int modelZoomLevel,
+                             int &f0, int &f1) const;
 
     float getNormalizeGain(View *v, int channel) const;
 
     virtual void flagBaseColourChanged() { m_cacheValid = false; }