diff options
author | Robin Gareus <robin@gareus.org> | 2017-07-12 06:55:44 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2017-07-12 06:55:44 +0200 |
commit | 23bb15dcf1848833557715a44a7d91c1ba8787be (patch) | |
tree | 94d3b8f58a3cd1c855d894f83bfaee9141297764 /gtk2_ardour/route_processor_selection.cc | |
parent | fd8053da9eaf5e97aaa978d971410d4f246c7138 (diff) |
Honor groups for mixer selection
Diffstat (limited to 'gtk2_ardour/route_processor_selection.cc')
-rw-r--r-- | gtk2_ardour/route_processor_selection.cc | 61 |
1 files changed, 49 insertions, 12 deletions
diff --git a/gtk2_ardour/route_processor_selection.cc b/gtk2_ardour/route_processor_selection.cc index 0dc15e7f8a..ed182db415 100644 --- a/gtk2_ardour/route_processor_selection.cc +++ b/gtk2_ardour/route_processor_selection.cc @@ -76,6 +76,26 @@ RouteProcessorSelection::clear_routes () } } +std::list<AxisView*> +RouteProcessorSelection::add_grouped_tracks (AxisView* r) const +{ + std::list<AxisView*> rv; + + boost::shared_ptr<Route> route = boost::dynamic_pointer_cast<Route>(r->stripable()); + if (route) { + ARDOUR::RouteGroup* rg = route->route_group (); + if (rg && rg->is_active() && rg->is_select ()) { + + boost::shared_ptr<RouteList> rl = rg->route_list (); + for (RouteList::const_iterator i = rl->begin(); i != rl->end(); ++i) { + AxisView* av = avp.axis_view_by_stripable (*i); + rv.push_back (av); + } + } + } + return rv; +} + void RouteProcessorSelection::presentation_info_changed (PropertyChange const & what_changed) { @@ -110,32 +130,48 @@ RouteProcessorSelection::presentation_info_changed (PropertyChange const & what_ } void -RouteProcessorSelection::add (AxisView* r) +RouteProcessorSelection::add (AxisView* r, bool with_groups) { if (!shp.session()) { return; } - if (axes.insert (r).second) { - - shp.session()->selection().add (r->stripable(), boost::shared_ptr<AutomationControl>()); - - MixerStrip* ms = dynamic_cast<MixerStrip*> (r); - - if (ms) { - ms->CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RouteProcessorSelection::remove, this, _1), gui_context()); + std::list<AxisView*> avl; + if (with_groups) { + avl= add_grouped_tracks (r); + } + avl.push_back (r); + + PresentationInfo::ChangeSuspender cs; + for (std::list<AxisView*>::const_iterator i = avl.begin (); i != avl.end (); ++i) { + if (axes.insert (*i).second) { + shp.session()->selection().add ((*i)->stripable(), boost::shared_ptr<AutomationControl>()); + MixerStrip* ms = dynamic_cast<MixerStrip*> (*i); + if (ms) { + ms->CatchDeletion.connect (*this, invalidator (*this), boost::bind (&RouteProcessorSelection::remove, this, _1, false), gui_context()); + } } } } void -RouteProcessorSelection::remove (AxisView* r) +RouteProcessorSelection::remove (AxisView* r, bool with_groups) { if (!shp.session()) { return; } ENSURE_GUI_THREAD (*this, &RouteProcessorSelection::remove, r); - shp.session()->selection().remove (r->stripable(), boost::shared_ptr<AutomationControl>()); + + std::list<AxisView*> avl; + if (with_groups) { + avl= add_grouped_tracks (r); + } + avl.push_back (r); + + PresentationInfo::ChangeSuspender cs; + for (std::list<AxisView*>::const_iterator i = avl.begin (); i != avl.end (); ++i) { + shp.session()->selection().remove ((*i)->stripable(), boost::shared_ptr<AutomationControl>()); + } } void @@ -144,7 +180,8 @@ RouteProcessorSelection::set (AxisView* r) if (!shp.session()) { return; } - shp.session()->selection().set (r->stripable(), boost::shared_ptr<AutomationControl>()); + shp.session()->selection().clear_stripables (); + add (r, true); } bool |