fix a bunch of missing symbols related to temporal

libs/temporal/timeline.cc

@@ -219,6 +219,100 @@ timecnt_t::to_string () const
 	return ss.str();
 }
 
+timecnt_t
+timecnt_t::operator+ (timecnt_t const & other) const
+{
+	if (time_domain() == AudioTime) {
+		if (other.time_domain() == AudioTime) {
+			/* both audio, just add and use an arbitrary position */
+			return timecnt_t (_distance + other.distance(), _position);
+		} else {
+			return timecnt_t (_distance + other.samples(), _position);
+		}
+	}
+
+	return timecnt_t (beats() + other.beats(), _position);
+}
+
+timecnt_t
+timecnt_t::operator- (timecnt_t const & other) const
+{
+	if (time_domain() == AudioTime) {
+		if (other.time_domain() == AudioTime) {
+			return timecnt_t (_distance - other.distance(), _position);
+		} else {
+			return timecnt_t (_distance - other.samples(), _position);
+		}
+	}
+
+	return timecnt_t (beats() - other.beats(), _position);
+}
+
+timecnt_t &
+timecnt_t::operator+= (timecnt_t const & other)
+{
+	if (time_domain() == AudioTime) {
+		if (other.time_domain() == AudioTime) {
+			_distance += other.distance();
+		} else {
+			_distance += other.samples();
+		}
+	} else {
+		_distance += other.ticks ();
+	}
+
+	return *this;
+}
+
+timecnt_t
+timecnt_t::operator+ (timepos_t const & other) const
+{
+	if (time_domain() == AudioTime) {
+		if (other.time_domain() == AudioTime) {
+			/* both audio, just add and use an arbitrary position */
+			return timecnt_t (_distance + other.val(), _position);
+		} else {
+			return timecnt_t (_distance + other.samples(), _position);
+		}
+	}
+
+	return timecnt_t (beats() + other.beats(), _position);
+}
+
+timecnt_t
+timecnt_t::operator- (timepos_t const & other) const
+{
+	if (time_domain() == AudioTime) {
+		if (other.time_domain() == AudioTime) {
+			return timecnt_t (_distance - other.val(), _position);
+		} else {
+			return timecnt_t (_distance - other.samples(), _position);
+		}
+	}
+
+	return timecnt_t (beats() - other.beats(), _position);
+}
+
+timecnt_t &
+timecnt_t::operator-= (timecnt_t const & other)
+{
+	if (time_domain() == other.time_domain()) {
+		_distance -= other.distance();
+	} else if (time_domain() == AudioTime) {
+		_distance -= other.samples();
+	} else {
+		_distance -= other.ticks ();
+	}
+
+	return *this;
+}
+
+timecnt_t
+timecnt_t::operator- () const
+{
+	return timecnt_t (-_distance, _position);
+}
+
 /* timepos */
 
 timepos_t::timepos_t (timecnt_t const & t)
@@ -239,6 +333,46 @@ timepos_t::operator= (timecnt_t const & t)
 	return *this;
 }
 
+bool
+timepos_t::operator< (timecnt_t const & t) const
+{
+	if (time_domain() == AudioTime) {
+		return superclocks() < t.superclocks();
+	}
+
+	return beats() < t.beats ();
+}
+
+bool
+timepos_t::operator> (timecnt_t const & t) const
+{
+	if (time_domain() == AudioTime) {
+		return superclocks() > t.superclocks();
+	}
+
+	return beats() > t.beats ();
+}
+
+bool
+timepos_t::operator<= (timecnt_t const & t) const
+{
+	if (time_domain() == AudioTime) {
+		return superclocks() <= t.superclocks();
+	}
+
+	return beats() <= t.beats ();
+}
+
+bool
+timepos_t::operator>= (timecnt_t const & t) const
+{
+	if (time_domain() == AudioTime) {
+		return superclocks() >= t.superclocks();
+	}
+
+	return beats() >= t.beats ();
+}
+
 void
 timepos_t::set_superclock (superclock_t s)
 {
@@ -386,6 +520,34 @@ timepos_t::earlier (Temporal::Beats const & b) const
 	return timepos_t (bb - b);
 }
 
+timepos_t
+timepos_t::earlier (Temporal::BBT_Offset const & offset) const
+{
+	TempoMap::SharedPtr tm (TempoMap::use());
+
+	if (is_superclock()) {
+		return timepos_t (tm->superclock_at (tm->bbt_walk (tm->bbt_at (superclocks()), -offset)));
+	}
+
+	return timepos_t (tm->bbtwalk_to_quarters (beats(), -offset));
+}
+
+
+timepos_t &
+timepos_t::shift_earlier (Temporal::BBT_Offset const & offset)
+{
+	TempoMap::SharedPtr tm (TempoMap::use());
+
+	if (is_superclock()) {
+		v = build (false, (tm->superclock_at (tm->bbt_walk (tm->bbt_at (superclocks()), -offset))));
+	} else {
+		v = build (true, tm->bbtwalk_to_quarters (beats(), -offset).to_ticks());
+	}
+
+	return *this;
+}
+
+
 timepos_t
 timepos_t::earlier (timepos_t const & other) const
 {
@@ -405,6 +567,46 @@ timepos_t::earlier (timecnt_t const & distance) const
 	return earlier (distance.beats());
 }
 
+bool
+timepos_t::expensive_lt (timepos_t const & other) const
+{
+	if (time_domain() == AudioTime) {
+		return superclocks() < other.superclocks();
+	}
+
+	return beats() < other.beats ();
+}
+
+bool
+timepos_t::expensive_gt (timepos_t const & other) const
+{
+	if (time_domain() == AudioTime) {
+		return superclocks() < other.superclocks();
+	}
+
+	return beats() > other.beats ();
+}
+
+bool
+timepos_t::expensive_lte (timepos_t const & other) const
+{
+	if (time_domain() == AudioTime) {
+		return superclocks() < other.superclocks();
+	}
+
+	return beats() <= other.beats ();
+}
+
+bool
+timepos_t::expensive_gte (timepos_t const & other) const
+{
+	if (time_domain() == AudioTime) {
+		return superclocks() < other.superclocks();
+	}
+
+	return beats() >= other.beats ();
+}
+
 /* */
 
 timepos_t &
@@ -446,6 +648,19 @@ timepos_t::shift_earlier (Temporal::Beats const & b)
 
 /* */
 
+timepos_t &
+timepos_t::operator+= (Temporal::BBT_Offset const & offset)
+{
+	TempoMap::SharedPtr tm (TempoMap::use());
+	if (is_beats()) {
+		v = build (true, tm->bbtwalk_to_quarters (beats(), offset));
+	} else {
+		v = build (false, tm->superclock_at (tm->bbt_walk (tm->bbt_at (superclocks()), offset)));
+	}
+
+	return *this;
+}
+
 timepos_t &
 timepos_t::operator+=(Temporal::Beats const & b)
 {