ardour/livetrax
13
0
Fork 0
Code

Catch manual removal of subgroup bus (#9022)

Browse Source
This commit is contained in:
Robin Gareus 2022-10-21 20:40:15 +02:00
parent b9b4313873
commit e9bafde628
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/route_group.h
View File

@ -189,6 +189,7 @@ private:
boost::shared_ptr<ControlGroup> _monitoring_group; boost::shared_ptr<ControlGroup> _monitoring_group;
void remove_when_going_away (boost::weak_ptr<Route>); void remove_when_going_away (boost::weak_ptr<Route>);
void unset_subgroup_bus ();
int set_state_2X (const XMLNode&, int); int set_state_2X (const XMLNode&, int);
void post_set (PBD::PropertyChange const &); void post_set (PBD::PropertyChange const &);

11
libs/ardour/route_group.cc
View File

@ -208,6 +208,15 @@ RouteGroup::remove_when_going_away (boost::weak_ptr<Route> wr)
} }
} }
void
RouteGroup::unset_subgroup_bus ()
{
if (_session.deletion_in_progress()) {
return;
}
_subgroup_bus.reset ();
}
int int
RouteGroup::remove (boost::shared_ptr<Route> r) RouteGroup::remove (boost::shared_ptr<Route> r)
{ {
@ -316,6 +325,7 @@ RouteGroup::set_state (const XMLNode& node, int version)
boost::shared_ptr<Route> r = _session.route_by_id (subgroup_id); boost::shared_ptr<Route> r = _session.route_by_id (subgroup_id);
if (r) { if (r) {
_subgroup_bus = r; _subgroup_bus = r;
_subgroup_bus->DropReferences.connect_same_thread (*this, boost::bind (&RouteGroup::unset_subgroup_bus, this));
} }
} }
@ -565,6 +575,7 @@ RouteGroup::make_subgroup (bool aux, Placement placement)
_subgroup_bus = rl.front(); _subgroup_bus = rl.front();
_subgroup_bus->set_name (_name); _subgroup_bus->set_name (_name);
_subgroup_bus->DropReferences.connect_same_thread (*this, boost::bind (&RouteGroup::unset_subgroup_bus, this));
if (aux) { if (aux) {