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

Fix setting session-range when regions move 

Since cc6c0f1263 there is no Properties::position event
when a region is moved. So notify_region_moved() or
notify_region_start_trimmed() was never emitted and
Session::maybe_update_session_range() was not called.
This commit is contained in:
Robin Gareus 2022-03-04 22:37:28 +01:00
parent 6c4c827575
commit 1462590ace
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ardour/playlist.cc
View File

@ -1594,7 +1594,7 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar
return;
}
if (what_changed.contains (Properties::position)) {
if (what_changed.contains (Properties::length)) {
/* remove it from the list then add it back in
* the right place again.
*/
@ -1613,9 +1613,6 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar
regions.erase (i);
regions.insert (upper_bound (regions.begin (), regions.end (), region, cmp), region);
}
if (what_changed.contains (Properties::position) || what_changed.contains (Properties::length)) {
if (holding_state ()) {
pending_bounds.push_back (region);
@ -1661,7 +1658,6 @@ Playlist::region_changed (const PropertyChange& what_changed, boost::shared_ptr<
our_interests.add (Properties::contents);
bounds.add (Properties::start);
bounds.add (Properties::position);
bounds.add (Properties::length);
bool send_contents = false;
@ -1676,11 +1672,12 @@ Playlist::region_changed (const PropertyChange& what_changed, boost::shared_ptr<
send_contents = true;
}
if (what_changed.contains (Properties::position) && !what_changed.contains (Properties::length)) {
/* since cc6c0f1263ab272707b0241ec333776036515fc2 can no longer distinguish between
* position and length changes, so we have to assume that all have happpened :(
*/
if (what_changed.contains (Properties::length)) {
notify_region_moved (region);
} else if (!what_changed.contains (Properties::position) && what_changed.contains (Properties::length)) {
notify_region_end_trimmed (region);
} else if (what_changed.contains (Properties::position) && what_changed.contains (Properties::length)) {
notify_region_start_trimmed (region);
}