Mercurial > hg > svgui
comparison layer/Layer.h @ 1317:c2fa7bb1eca9 import-audio-data
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 04 Sep 2018 13:19:32 +0100 |
parents | 1d7921b1852f |
children | 1eb560b363e7 |
comparison
equal
deleted
inserted
replaced
1312:fcc1f45f7bd5 | 1317:c2fa7bb1eca9 |
---|---|
624 MeasureRectSet::const_iterator findFocusedMeasureRect(QPoint) const; | 624 MeasureRectSet::const_iterator findFocusedMeasureRect(QPoint) const; |
625 | 625 |
626 void paintMeasurementRect(LayerGeometryProvider *v, QPainter &paint, | 626 void paintMeasurementRect(LayerGeometryProvider *v, QPainter &paint, |
627 const MeasureRect &r, bool focus) const; | 627 const MeasureRect &r, bool focus) const; |
628 | 628 |
629 bool valueExtentsMatchMine(LayerGeometryProvider *v) const; | |
630 | |
629 QString m_presentationName; | 631 QString m_presentationName; |
630 | 632 |
631 private: | 633 private: |
632 mutable QMutex m_dormancyMutex; | 634 mutable QMutex m_dormancyMutex; |
633 mutable std::map<const void *, bool> m_dormancy; | 635 mutable std::map<const void *, bool> m_dormancy; |