From 85f640c31a8c56f14fcb6111886c2e77dc885ad2 Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Tue, 19 Jul 2022 12:32:50 -0500 Subject: [PATCH] ripple: prevent session/punch/loop markers moving during ripple-all Locations::ripple() skips these markers when the ripple action is committed. ...but the editor moves the marker-items as a visual aid, before actually committing the changes to Locations() ...so the editor needs the same logic, to avoid visually inconsistent behavior --- gtk2_ardour/editor_markers.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 34b72bbf7b..5cdd2f33cd 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -538,6 +538,9 @@ Editor::get_markers_to_ripple (boost::shared_ptr target_playlist, time const timepos_t ripple_start = effective_ripple_mark_start (target_playlist, pos); for (LocationMarkerMap::const_iterator i = location_markers.begin(); i != location_markers.end(); ++i) { + if ( i->first->is_session_range() || i->first->is_auto_punch() || i->first->is_auto_loop() ) { + continue; + } if (i->first->start() >= ripple_start) { cerr << "Add markers for " << i->first->name() << endl; markers.push_back (i->second->start);