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

Fix VCA Automation Lane selection

Browse source 
This moves child-selection API up into TAV (Superclass of StripableTAV
which actually owns the children)
This commit is contained in:
Robin Gareus 2017-07-07 14:47:36 +02:00
parent f2c7f2fdcb
commit 68c106eab5
3 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gtk2_ardour/route_time_axis.cc
View file

@ -1345,9 +1345,7 @@ RouteTimeAxisView::selection_click (GdkEventButton* ev)
void void
RouteTimeAxisView::set_selected_points (PointSelection& points) RouteTimeAxisView::set_selected_points (PointSelection& points)
{ {
for (Children::iterator i = children.begin(); i != children.end(); ++i) { StripableTimeAxisView::set_selected_points (points);
(*i)->set_selected_points (points);
}
AudioStreamView* asv = dynamic_cast<AudioStreamView*>(_view); AudioStreamView* asv = dynamic_cast<AudioStreamView*>(_view);
if (asv) { if (asv) {
asv->set_selected_points (points); asv->set_selected_points (points);
@ -1382,12 +1380,7 @@ RouteTimeAxisView::get_selectables (framepos_t start, framepos_t end, double top
} }
/* pick up visible automation tracks */ /* pick up visible automation tracks */
StripableTimeAxisView::get_selectables (start_adjusted, end_adjusted, top, bot, results, within);
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
if (!(*i)->hidden()) {
(*i)->get_selectables (start_adjusted, end_adjusted, top, bot, results, within);
}
}
} }
void void
@ -1396,14 +1389,7 @@ RouteTimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>&
if (_view) { if (_view) {
_view->get_inverted_selectables (sel, results); _view->get_inverted_selectables (sel, results);
} }
StripableTimeAxisView::get_inverted_selectables (sel, results);
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
if (!(*i)->hidden()) {
(*i)->get_inverted_selectables (sel, results);
}
}
return;
} }
RouteGroup* RouteGroup*

24
gtk2_ardour/time_axis_view.cc
View file

@ -1017,15 +1017,31 @@ TimeAxisView::remove_child (boost::shared_ptr<TimeAxisView> child)
* @param result Filled in with selectable things. * @param result Filled in with selectable things.
*/ */
void void
TimeAxisView::get_selectables (framepos_t /*start*/, framepos_t /*end*/, double /*top*/, double /*bot*/, list<Selectable*>& /*result*/, bool /*within*/) TimeAxisView::get_selectables (framepos_t start, framepos_t end, double top, double bot, list<Selectable*>& results, bool within)
{ {
return; for (Children::iterator i = children.begin(); i != children.end(); ++i) {
if (!(*i)->hidden()) {
(*i)->get_selectables (start, end, top, bot, results, within);
}
}
} }
void void
TimeAxisView::get_inverted_selectables (Selection& /*sel*/, list<Selectable*>& /*result*/) TimeAxisView::set_selected_points (PointSelection& points)
{ {
return; for (Children::iterator i = children.begin(); i != children.end(); ++i) {
(*i)->set_selected_points (points);
}
}
void
TimeAxisView::get_inverted_selectables (Selection& sel, list<Selectable*>& results)
{
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
if (!(*i)->hidden()) {
(*i)->get_inverted_selectables (sel, results);
}
}
} }
void void

2
gtk2_ardour/time_axis_view.h
View file

@ -189,7 +189,7 @@ class TimeAxisView : public virtual AxisView
const int32_t sub_num) { return false; } const int32_t sub_num) { return false; }
virtual void set_selected_regionviews (RegionSelection&) {} virtual void set_selected_regionviews (RegionSelection&) {}
virtual void set_selected_points (PointSelection&) {} virtual void set_selected_points (PointSelection&);
virtual void fade_range (TimeSelection&) {} virtual void fade_range (TimeSelection&) {}