ardour/livetrax
13
0
Fork 0
Code

libtemporal: fix implementation of timecnt_t::operator+ (timecnt_t)

Browse Source
This commit is contained in:
Paul Davis 2020-12-23 13:15:44 -07:00
parent 993186e9fc
commit 9438295607
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/temporal/timeline.cc
View File

@ -220,13 +220,16 @@ timecnt_t::to_string () const
timecnt_t timecnt_t
timecnt_t::operator+ (timecnt_t const & other) const timecnt_t::operator+ (timecnt_t const & other) const
{ {
if (time_domain() == other.time_domain()) {
int62_t v (_distance.flagged(), _distance.val() + other.distance().val());
return timecnt_t (v, _position);
}
/* mismatched time domains */
if (time_domain() == AudioTime) { if (time_domain() == AudioTime) {
if (other.time_domain() == AudioTime) { /* other must be beats */
/* both audio, just add and use an arbitrary position */ return timecnt_t (_distance + other.superclocks(), _position);
return timecnt_t (_distance + other.distance(), _position);
} else {
return timecnt_t (_distance + other.samples(), _position);
}
} }
return timecnt_t (beats() + other.beats(), _position); return timecnt_t (beats() + other.beats(), _position);