ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

temporal: improve implementation of TempoMap::meter_at() and more templating

Browse Source 
Needed to move template defns around to ensure that required instances are defined
This commit is contained in:
Paul Davis 2021-11-13 10:36:27 -07:00
parent 4128088b70
commit 7a12458244
2 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libs/temporal/tempo.cc
View File

@ -2855,24 +2855,10 @@ TempoMap::tempo_at (timepos_t const & pos) const
return pos.is_beats() ? tempo_at (pos.beats()) : tempo_at (pos.superclocks());
}
template<typename TimeType, typename Comparator>
TempoPoint const &
TempoMap::_tempo_at (TimeType when, Comparator cmp) const
MeterPoint const &
TempoMap::meter_at (timepos_t const & pos) const
{
assert (!_tempos.empty());
Tempos::const_iterator prev = _tempos.end();
for (Tempos::const_iterator t = _tempos.begin(); t != _tempos.end(); ++t) {
if (cmp (*t, when)) {
prev = t;
} else {
break;
}
}
if (prev == _tempos.end()) {
return _tempos.front();
}
return *prev;
return pos.is_beats() ? meter_at (pos.beats()) : meter_at (pos.superclocks());
}
TempoMetric

48
libs/temporal/temporal/tempo.h
View File

@ -680,7 +680,7 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible
LIBTEMPORAL_API TempoMap (TempoMap const&);
LIBTEMPORAL_API TempoMap (XMLNode const&, int version);
LIBTEMPORAL_API ~TempoMap();
LIBTEMPORAL_API TempoMap& operator= (TempoMap const&);
LIBTEMPORAL_API void sample_rate_changed (samplecnt_t new_sr);
@ -755,12 +755,46 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible
LIBTEMPORAL_API TempoMetric metric_at (Beats const &, bool can_match = true) const;
LIBTEMPORAL_API TempoMetric metric_at (BBT_Time const &, bool can_match = true) const;
/* essentially convenience methods */
private:
template<typename TimeType, typename Comparator> TempoPoint const & _tempo_at (TimeType when, Comparator cmp) const {
assert (!_tempos.empty());
LIBTEMPORAL_API MeterPoint const& meter_at (timepos_t const & p) const { return metric_at (p).meter(); }
LIBTEMPORAL_API MeterPoint const& meter_at (superclock_t sc) const { return metric_at (sc).meter(); }
LIBTEMPORAL_API MeterPoint const& meter_at (Beats const & b) const { return metric_at (b).meter(); }
LIBTEMPORAL_API MeterPoint const& meter_at (BBT_Time const & bbt) const { return metric_at (bbt).meter(); }
Tempos::const_iterator prev = _tempos.end();
for (Tempos::const_iterator t = _tempos.begin(); t != _tempos.end(); ++t) {
if (cmp (*t, when)) {
prev = t;
} else {
break;
}
}
if (prev == _tempos.end()) {
return _tempos.front();
}
return *prev;
}
template<typename TimeType, typename Comparator> MeterPoint const & _meter_at (TimeType when, Comparator cmp) const {
assert (!_meters.empty());
Meters::const_iterator prev = _meters.end();
for (Meters::const_iterator m = _meters.begin(); m != _meters.end(); ++m) {
if (cmp (*m, when)) {
prev = m;
} else {
break;
}
}
if (prev == _meters.end()) {
return _meters.front();
}
return *prev;
}
public:
LIBTEMPORAL_API MeterPoint const& meter_at (timepos_t const & p) const;
LIBTEMPORAL_API MeterPoint const& meter_at (superclock_t sc) const { return _meter_at (sc, Point::sclock_comparator()); }
LIBTEMPORAL_API MeterPoint const& meter_at (Beats const & b) const { return _meter_at (b, Point::beat_comparator()); }
LIBTEMPORAL_API MeterPoint const& meter_at (BBT_Time const & bbt) const { return _meter_at (bbt, Point::bbt_comparator()); }
LIBTEMPORAL_API TempoPoint const& tempo_at (timepos_t const & p) const;
LIBTEMPORAL_API TempoPoint const& tempo_at (superclock_t sc) const { return _tempo_at (sc, Point::sclock_comparator()); }
@ -868,8 +902,6 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible
BBT_Time bbt_at (Beats const &) const;
BBT_Time bbt_at (superclock_t sc) const;
template<typename TimeType, typename Comparator> TempoPoint const & _tempo_at (TimeType when, Comparator cmp) const;
template<typename T, typename T1> struct const_traits {
typedef Points::const_iterator iterator_type;
typedef TempoPoint const * tempo_point_type;