From 62416ee2765b8c15e27163607ff179babe4a387e Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 4 Oct 2023 18:48:04 -0600 Subject: [PATCH] remove unnecessary argument from Playlist::shift() --- libs/ardour/ardour/playlist.h | 2 +- libs/ardour/playlist.cc | 16 +--------------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index ebc0e98fbb..8405fd197c 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -177,7 +177,7 @@ public: void replace_region (std::shared_ptr old, std::shared_ptr newr, timepos_t const & pos); void split_region (std::shared_ptr, timepos_t const & position); void split (timepos_t const & at); - void shift (timepos_t const & at, timecnt_t const & distance, bool move_intersected, bool ignore_music_glue); + void shift (timepos_t const & at, timecnt_t const & distance, bool move_intersected); void partition (timepos_t const & start, timepos_t const & end, bool cut = false); void duplicate (std::shared_ptr, timepos_t & position, float times); void duplicate (std::shared_ptr, timepos_t & position, timecnt_t const & gap, float times); diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 6cfe91bb8a..9bb5d0259c 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -1452,7 +1452,7 @@ Playlist::duplicate_ranges (std::list& ranges, float times) } void -Playlist::shift (timepos_t const & at, timecnt_t const & distance, bool move_intersected, bool ignore_music_glue) +Playlist::shift (timepos_t const & at, timecnt_t const & distance, bool move_intersected) { PBD::Unwinder uw (_playlist_shift_active, true); RegionWriteLock rlock (this); @@ -1473,23 +1473,9 @@ Playlist::shift (timepos_t const & at, timecnt_t const & distance, bool move_int } } - /* do not move regions glued to music time - that - * has to be done separately. - */ - - if (!ignore_music_glue && r->position().time_domain() != Temporal::AudioTime) { - fixup.push_back (r); - continue; - } - rlock.thawlist.add (r); r->set_position (r->position() + distance); } - - /* XXX: may not be necessary; Region::post_set should do this, I think */ - for (auto & r : fixup) { - r->recompute_position_from_time_domain (); - } } void