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

libtemporal: add timecnt_t::end() and timecnt_t::set_time_domain()

Browse Source
This commit is contained in:
Paul Davis 2021-02-26 12:21:13 -07:00
parent 3bf6e013ee
commit c0c3fd07c9
2 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/temporal/temporal/timeline.h
View File

@ -324,6 +324,9 @@ class LIBTEMPORAL_API timecnt_t {
int62_t const & distance() const { return _distance; }
timepos_t const & position() const { return _position; }
timepos_t const & origin() const { return _position; } /* alias */
timepos_t end (TimeDomain) const;
timepos_t end () const { return end (time_domain()); }
void set_position (timepos_t const &pos);
bool positive() const { return _distance.val() > 0; }
@ -336,6 +339,7 @@ class LIBTEMPORAL_API timecnt_t {
timecnt_t abs() const;
Temporal::TimeDomain time_domain () const { return _distance.flagged() ? BeatTime : AudioTime; }
void set_time_domain (Temporal::TimeDomain);
superclock_t superclocks() const { if (!_distance.flagged()) return _distance.val(); return compute_superclocks(); }
int64_t samples() const { return superclock_to_samples (superclocks(), TEMPORAL_SAMPLE_RATE); }

71
libs/temporal/timeline.cc
View File

@ -81,6 +81,77 @@ timecnt_t::timecnt_t (timecnt_t const & tc, timepos_t const & pos)
_distance = tc.distance();
}
timepos_t
timecnt_t::end (TimeDomain return_domain) const
{
if (_distance.flagged() && _position.time_domain() == BeatTime && return_domain == BeatTime) {
/* everything in BeatTime, so just add */
return timepos_t (_position.beats() + Beats::ticks (magnitude()));
}
if (!_distance.flagged() && _position.time_domain() == AudioTime && return_domain == AudioTime) {
/* everything in AudioTime, so just add */
return timepos_t::from_superclock (_position.superclocks() + magnitude());
}
if (_distance.flagged()) { /* _distance in beats */
if (_position.time_domain() == BeatTime) {
/* distance & position in beats, so return must be audio (all 3 as beats is handled above) */
return timepos_t::from_superclock (TempoMap::use()->superclock_at ( _position.beats() + Beats::ticks (magnitude())));
} else if (_position.time_domain() == AudioTime) {
const Beats b = TempoMap::use()->quarters_at_superclock (_position.superclocks() + magnitude());
if (return_domain == BeatTime) {
return timepos_t (b);
} else {
return timepos_t::from_superclock (TempoMap::use()->superclock_at (b));
}
}
} else { /* _distance in audio time */
if (_position.time_domain() == AudioTime) {
/* distance & position in audio, so return must be beats (all 3 as audio is handled above) */
return timepos_t (TempoMap::use()->quarters_at_superclock (_position.superclocks() + magnitude()));
} else if (_position.time_domain() == BeatTime) {
const superclock_t sc = TempoMap::use()->superclock_at (_position.beats()) + magnitude();
if (return_domain == AudioTime) {
return timepos_t::from_superclock (sc);
} else {
return timepos_t (TempoMap::use()->quarters_at_superclock (sc));
}
}
}
/*NOTREACHED*/
}
void
timecnt_t::set_time_domain (TimeDomain td)
{
if (time_domain() == td) {
return;
}
_position.set_time_domain (td);
if (_distance.flagged()) {
/* beats -> superclock */
_distance = int62_t (false, TempoMap::use()->superclock_at (Beats::ticks (magnitude())));
} else {
/* superclock -> beats */
_distance = int62_t (true, TempoMap::use()->quarters_at_superclock (magnitude()).to_ticks());
}
}
void
timecnt_t::set_position (timepos_t const & pos)
{