comparison layer/TimeRulerLayer.h @ 944:78c152e4db95

Merge from branch tonioni
author Chris Cannam
date Mon, 20 Apr 2015 09:12:17 +0100
parents b66fb15de477
children 94e4952a6774 e53a87a5efb2
comparison
equal deleted inserted replaced
896:78e041e45ff0 944:78c152e4db95
39 39
40 enum LabelHeight { LabelTop, LabelMiddle, LabelBottom }; 40 enum LabelHeight { LabelTop, LabelMiddle, LabelBottom };
41 void setLabelHeight(LabelHeight h) { m_labelHeight = h; } 41 void setLabelHeight(LabelHeight h) { m_labelHeight = h; }
42 LabelHeight getLabelHeight() const { return m_labelHeight; } 42 LabelHeight getLabelHeight() const { return m_labelHeight; }
43 43
44 virtual bool snapToFeatureFrame(View *, int &, int &, SnapType) const; 44 virtual bool snapToFeatureFrame(View *, sv_frame_t &, int &, SnapType) const;
45 45
46 virtual ColourSignificance getLayerColourSignificance() const { 46 virtual ColourSignificance getLayerColourSignificance() const {
47 return ColourIrrelevant; 47 return ColourIrrelevant;
48 } 48 }
49 49
50 virtual bool getValueExtents(float &, float &, bool &, QString &) const { 50 virtual bool getValueExtents(double &, double &, bool &, QString &) const {
51 return false; 51 return false;
52 } 52 }
53 53
54 virtual QString getLayerPresentationName() const; 54 virtual QString getLayerPresentationName() const;
55 55