Mercurial > hg > svgui

diff layer/WaveformLayer.cpp @ 806:4c8ca536b54f warnfix_no_size_t

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some more unsigned/long removal
author Chris Cannam
date Tue, 17 Jun 2014 15:36:56 +0100
parents 1d526ba11a24
children 99f96cacde36
line wrap: on
line diff
--- a/layer/WaveformLayer.cpp	Tue Jun 17 15:18:06 2014 +0100
+++ b/layer/WaveformLayer.cpp	Tue Jun 17 15:36:56 2014 +0100
@@ -410,7 +410,7 @@
 WaveformLayer::getSourceFramesForX(View *v, int x, int modelZoomLevel,
                                    int &f0, int &f1) const
 {
-    long viewFrame = v->getFrameForX(x);
+    int viewFrame = v->getFrameForX(x);
     if (viewFrame < 0) {
         f0 = 0;
         f1 = 0;
@@ -434,13 +434,11 @@
 float
 WaveformLayer::getNormalizeGain(View *v, int channel) const
 {
-    long startFrame = v->getStartFrame();
-    long endFrame = v->getEndFrame();
+    int startFrame = v->getStartFrame();
+    int endFrame = v->getEndFrame();
 
-    // Although a long for purposes of comparison against the view
-    // start and end frames, these are known to be non-negative
-    long modelStart = long(m_model->getStartFrame());
-    long modelEnd = long(m_model->getEndFrame());
+    int modelStart = m_model->getStartFrame();
+    int modelEnd = m_model->getEndFrame();
     
     int rangeStart, rangeEnd;