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

libtemporal: catch attempts to convert max audio time values into beats, early

Browse Source
This commit is contained in:
Paul Davis 2021-02-13 22:21:43 -07:00
parent 39f52cd3ce
commit 433a9ebe48
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/temporal/timeline.cc
View File

@ -453,24 +453,34 @@ timepos_t::operator>= (timecnt_t const & t) const
superclock_t
timepos_t::_superclocks () const
{
assert (time_domain() == BeatTime);
stats.beats_to_audio++;
TempoMap::SharedPtr tm (TempoMap::use());
return tm->superclock_at (beats ());
return TempoMap::use()->superclock_at (beats ());
}
Temporal::Beats
timepos_t::_beats () const
{
assert (time_domain() == AudioTime);
stats.audio_to_beats++;
TempoMap::SharedPtr tm (TempoMap::use());
return tm->quarters_at_superclock (v);
/* see notes in Temporal::TempoPoint::quarters_at_superclock() for
* more. Basically, specially case "max-superclocks" and return
* "max-beats"
*/
if (val() == int62_t::max) {
return std::numeric_limits<Beats>::max ();
}
return TempoMap::use()->quarters_at_superclock (v);
}
int64_t
timepos_t::_ticks () const
{
assert (time_domain() == AudioTime);
return _beats().to_ticks();
}