ardour/livetrax
13
0
Fork 0
Code

when removing a Route from Session, remove it from CoreSelection and signal that change if necessary

Browse Source
This commit is contained in:
Paul Davis 2017-05-08 10:36:46 +01:00
parent 24b8004bf7
commit 7d523dc43c
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/ardour/session.cc
View File

@ -3719,6 +3719,7 @@ void
Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove) Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
{ {
bool mute_changed = false; bool mute_changed = false;
bool send_selected = false;
{ // RCU Writer scope { // RCU Writer scope
PBD::Unwinder<bool> uw_flag (_route_deletion_in_progress, true); PBD::Unwinder<bool> uw_flag (_route_deletion_in_progress, true);
@ -3727,6 +3728,10 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) { for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) {
if (_selection->selected (*iter)) {
send_selected = true;
}
if (*iter == _master_out) { if (*iter == _master_out) {
continue; continue;
} }
@ -3824,19 +3829,27 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
* and unregister ports from the backend * and unregister ports from the backend
*/ */
if (send_selected && !deletion_in_progress()) {
for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) {
_selection->remove_stripable_by_id ((*iter)->id());
}
PropertyChange so;
so.add (Properties::order);
if (send_selected) {
so.add (Properties::selected);
}
PresentationInfo::Change (so);
}
for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) { for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) {
cerr << "Drop references to " << (*iter)->name() << endl; cerr << "Drop references to " << (*iter)->name() << endl;
(*iter)->drop_references (); (*iter)->drop_references ();
} }
if (_state_of_the_state & Deletion) { if (deletion_in_progress()) {
return; return;
} }
PropertyChange so;
so.add (Properties::selected);
so.add (Properties::order);
PresentationInfo::Change (PropertyChange (so));
/* save the new state of the world */ /* save the new state of the world */