Mercurial > hg > svgui

diff layer/TimeRulerLayer.h @ 944:78c152e4db95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch tonioni
author Chris Cannam
date Mon, 20 Apr 2015 09:12:17 +0100
parents b66fb15de477
children 94e4952a6774 e53a87a5efb2
line wrap: on
line diff
--- a/layer/TimeRulerLayer.h	Thu Jan 15 10:42:00 2015 +0000
+++ b/layer/TimeRulerLayer.h	Mon Apr 20 09:12:17 2015 +0100
@@ -41,13 +41,13 @@
     void setLabelHeight(LabelHeight h) { m_labelHeight = h; }
     LabelHeight getLabelHeight() const { return m_labelHeight; }
 
-    virtual bool snapToFeatureFrame(View *, int &, int &, SnapType) const;
+    virtual bool snapToFeatureFrame(View *, sv_frame_t &, int &, SnapType) const;
 
     virtual ColourSignificance getLayerColourSignificance() const {
         return ColourIrrelevant;
     }
 
-    virtual bool getValueExtents(float &, float &, bool &, QString &) const {
+    virtual bool getValueExtents(double &, double &, bool &, QString &) const {
         return false;
     }