Mercurial > hg > svgui

diff layer/RegionLayer.cpp @ 990:2d4d0dbb94e3 simple-fft-model

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Wed, 07 Jan 2015 17:42:21 +0000
parents 3871dffc31bd
children 2adca8f05583
line wrap: on
line diff
--- a/layer/RegionLayer.cpp	Wed Jul 01 11:33:28 2015 +0100
+++ b/layer/RegionLayer.cpp	Wed Jan 07 17:42:21 2015 +0000
@@ -306,7 +306,7 @@
 {
     if (!m_model) return RegionModel::PointList();
 
-    long frame = v->getFrameForX(x);
+    sv_frame_t frame = v->getFrameForX(x);
 
     RegionModel::PointList onPoints =
 	m_model->getPoints(frame);
@@ -349,7 +349,7 @@
 {
     if (!m_model) return false;
 
-    long frame = v->getFrameForX(x);
+    sv_frame_t frame = v->getFrameForX(x);
 
     RegionModel::PointList onPoints = m_model->getPoints(frame);
     if (onPoints.empty()) return false;
@@ -1125,7 +1125,7 @@
 {
     if (!m_model) return;
 
-    long frame = v->getFrameForX(e->x());
+    sv_frame_t frame = v->getFrameForX(e->x());
     if (frame < 0) frame = 0;
     frame = frame / m_model->getResolution() * m_model->getResolution();
 
@@ -1263,7 +1263,7 @@
     int newx = m_dragPointX + xdist;
     int newy = m_dragPointY + ydist;
 
-    long frame = v->getFrameForX(newx);
+    sv_frame_t frame = v->getFrameForX(newx);
     if (frame < 0) frame = 0;
     frame = frame / m_model->getResolution() * m_model->getResolution();