Mercurial > hg > svgui

diff layer/TimeRulerLayer.h @ 922:26da827e8fb5 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from cxx11 branch
author Chris Cannam
date Mon, 23 Mar 2015 11:26:28 +0000
parents b66fb15de477
children 94e4952a6774 e53a87a5efb2
line wrap: on
line diff
--- a/layer/TimeRulerLayer.h	Mon Mar 23 10:04:51 2015 +0000
+++ b/layer/TimeRulerLayer.h	Mon Mar 23 11:26:28 2015 +0000
@@ -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;
     }