smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 16:46:35 +01:00
Code Issues Projects Releases Wiki Activity

following c40f40, make insert/remove time apply to all markers

Browse source 
That is, since there is no "glued-to" concept any more, if markers
are moving, then all markers are moving
This commit is contained in:
Paul Davis 2023-10-04 17:06:52 -06:00
parent 5b038e488c
commit 0ffb9d6c8a
1 changed files with 43 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/editor_ops.cc
View file

@ -8513,7 +8513,7 @@ Editor::insert_time (
(*i)->split (pos); (*i)->split (pos);
} }
(*i)->shift (pos, samples, (opt == MoveIntersected), true); (*i)->shift (pos, samples, (opt == MoveIntersected), false);
vector<Command*> cmds; vector<Command*> cmds;
(*i)->rdiff (cmds); (*i)->rdiff (cmds);
@ -8662,7 +8662,7 @@ Editor::remove_time (timepos_t const & pos, timecnt_t const & duration, InsertTi
TimelineRange ar(pos, pos+duration, 0); TimelineRange ar(pos, pos+duration, 0);
rl.push_back(ar); rl.push_back(ar);
pl->cut (rl); pl->cut (rl);
pl->shift (pos, -duration, true, true); pl->shift (pos, -duration, true, false);
XMLNode &after = pl->get_state(); XMLNode &after = pl->get_state();
@ -8689,7 +8689,6 @@ Editor::remove_time (timepos_t const & pos, timecnt_t const & duration, InsertTi
Locations::LocationList copy (_session->locations()->list()); Locations::LocationList copy (_session->locations()->list());
for (Locations::LocationList::iterator i = copy.begin(); i != copy.end(); ++i) { for (Locations::LocationList::iterator i = copy.begin(); i != copy.end(); ++i) {
if ((*i)->position_time_domain() == Temporal::AudioTime) {
bool const was_locked = (*i)->locked (); bool const was_locked = (*i)->locked ();
if (locked_markers_too) { if (locked_markers_too) {
@ -8738,7 +8737,6 @@ Editor::remove_time (timepos_t const & pos, timecnt_t const & duration, InsertTi
(*i)->lock (); (*i)->lock ();
} }
} }
}
for (list<Location*>::iterator i = loc_kill_list.begin(); i != loc_kill_list.end(); ++i) { for (list<Location*>::iterator i = loc_kill_list.begin(); i != loc_kill_list.end(); ++i) {
_session->locations()->remove (*i); _session->locations()->remove (*i);