From be9fdd98732c101388b4f6224bd64fa3c1bf3089 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 7 Oct 2022 16:10:55 -0600 Subject: [PATCH] libs: use {de,in}crement_by_domain() instead of {de,in} (libs) --- libs/ardour/ardour/region.h | 2 +- libs/ardour/audioregion.cc | 2 +- libs/ardour/playlist.cc | 12 +++++++----- libs/ardour/region.cc | 3 ++- libs/evoral/ControlList.cc | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index c8e0abbf8d..29244a6e74 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -123,7 +123,7 @@ public: timepos_t start () const { return _start.val(); } timecnt_t length () const { return _length.val(); } timepos_t end() const; - timepos_t nt_last() const { return end().decrement(); } + timepos_t nt_last() const { return end().decrement_by_domain(); } timepos_t source_position () const; timepos_t source_relative_position (Temporal::timepos_t const &) const; diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 961bf03f5c..556ef89135 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -1969,7 +1969,7 @@ AudioRegion::find_silence (Sample threshold, samplecnt_t min_length, samplecnt_t Temporal::Range AudioRegion::body_range () const { - return Temporal::Range ((position() + _fade_in->back()->when).increment(), end().earlier (_fade_out->back()->when)); + return Temporal::Range ((position() + _fade_in->back()->when).increment_by_domain(), end().earlier (_fade_out->back()->when)); } boost::shared_ptr diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 6cb77fb4a8..60d0cd459e 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -692,7 +692,7 @@ Playlist::add_region (boost::shared_ptr region, timepos_t const & positi timepos_t pos = position; if (times == 1 && auto_partition) { - partition_internal (pos.decrement(), (pos + region->length ()), true, rlock.thawlist); + partition_internal (pos.decrement_by_domain(), (pos + region->length ()), true, rlock.thawlist); for (auto const & r : rlock.thawlist) { _session.add_command (new StatefulDiffCommand (r)); } @@ -1050,7 +1050,8 @@ Playlist::partition_internal (timepos_t const & start, timepos_t const & end, bo current->clear_changes (); thawlist.add (current); - current->modify_end_unchecked (pos2.decrement(), true); + + current->modify_end_unchecked (pos2.decrement_by_domain(), true); } else if (overlap == Temporal::OverlapEnd) { @@ -1087,7 +1088,8 @@ Playlist::partition_internal (timepos_t const & start, timepos_t const & end, bo current->clear_changes (); thawlist.add (current); - current->modify_end_unchecked (pos2.decrement(), true); + + current->modify_end_unchecked (pos2.decrement_by_domain(), true); } else if (overlap == Temporal::OverlapStart) { @@ -1225,7 +1227,7 @@ Playlist::cut (timepos_t const & start, timecnt_t const & cnt, bool result_is_hi { RegionWriteLock rlock (this); - partition_internal (start, (start+cnt).decrement(), true, rlock.thawlist); + partition_internal (start, (start+cnt).decrement_by_domain(), true, rlock.thawlist); } return the_copy; @@ -1324,7 +1326,7 @@ Playlist::duplicate_until (boost::shared_ptr region, timepos_t & positio { RegionWriteLock rl (this); - while (position + region->length().decrement() < end) { + while ((position + region->length()).decrement_by_domain() < end) { boost::shared_ptr copy = RegionFactory::create (region, true, false, &rl.thawlist); add_region_internal (copy, position, rl.thawlist); set_layer (copy, DBL_MAX); diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 9daf354b51..1776b3b6d3 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -877,10 +877,11 @@ Region::cut_end (timepos_t const & new_endpoint) modify_end_unchecked (new_endpoint, true); } + void Region::modify_front_unchecked (timepos_t const & new_position, bool reset_fade) { - timepos_t last = end().decrement(); + timepos_t last = end().decrement_by_domain(); timepos_t source_zero; if (position() > start()) { diff --git a/libs/evoral/ControlList.cc b/libs/evoral/ControlList.cc index 050e36a34c..5b4dbb0cb3 100644 --- a/libs/evoral/ControlList.cc +++ b/libs/evoral/ControlList.cc @@ -1109,10 +1109,10 @@ ControlList::shift (timepos_t const & time, timecnt_t const & distance) } pos += distance; } else if (distance.is_negative() && pos > 0) { - ControlEvent cp (pos.decrement(), 0.0); + ControlEvent cp (pos.decrement_by_domain(), 0.0); iterator s = lower_bound (_events.begin(), _events.end(), &cp, time_comparator); if (s != _events.end ()) { - _events.insert (s, new ControlEvent (pos.decrement(), v0)); + _events.insert (s, new ControlEvent (pos.decrement_by_domain(), v0)); } } if (!dst_guard_exists) {