comparison layer/TimeRulerLayer.h @ 810:b68af2be4545 tonioni

Merge from branch warnfix_no_size_t
author Chris Cannam
date Wed, 18 Jun 2014 13:42:25 +0100
parents 1d526ba11a24
children b66fb15de477
comparison
equal deleted inserted replaced
802:584b11df8e4f 810:b68af2be4545
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 &, size_t &, SnapType) const; 44 virtual bool snapToFeatureFrame(View *, int &, 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