Move get_child_list() into TimeAxisView.
git-svn-id: svn://localhost/ardour2/branches/3.0@7574 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
5b520324ce
commit
3600f60a03
@ -5027,12 +5027,10 @@ Editor::timeaxisview_deleted (TimeAxisView *tv)
|
||||
entered_track = 0;
|
||||
}
|
||||
|
||||
if (rtav) {
|
||||
TimeAxisView::Children c = rtav->get_child_list ();
|
||||
for (TimeAxisView::Children::const_iterator i = c.begin(); i != c.end(); ++i) {
|
||||
if (entered_track == i->get()) {
|
||||
entered_track = 0;
|
||||
}
|
||||
TimeAxisView::Children c = tv->get_child_list ();
|
||||
for (TimeAxisView::Children::const_iterator i = c.begin(); i != c.end(); ++i) {
|
||||
if (entered_track == i->get()) {
|
||||
entered_track = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1390,20 +1390,6 @@ RouteTimeAxisView::paste (framepos_t pos, float times, Selection& selection, siz
|
||||
}
|
||||
|
||||
|
||||
TimeAxisView::Children
|
||||
RouteTimeAxisView::get_child_list()
|
||||
{
|
||||
TimeAxisView::Children redirect_children;
|
||||
|
||||
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
|
||||
if (!(*i)->hidden()) {
|
||||
redirect_children.push_back(*i);
|
||||
}
|
||||
}
|
||||
return redirect_children;
|
||||
}
|
||||
|
||||
|
||||
struct PlaylistSorter {
|
||||
bool operator() (boost::shared_ptr<Playlist> a, boost::shared_ptr<Playlist> b) const {
|
||||
return a->sort_id() < b->sort_id();
|
||||
|
@ -95,8 +95,6 @@ public:
|
||||
void cut_copy_clear (Selection&, Editing::CutCopyOp);
|
||||
bool paste (ARDOUR::framepos_t, float times, Selection&, size_t nth);
|
||||
|
||||
TimeAxisView::Children get_child_list();
|
||||
|
||||
void toggle_automation_track (const Evoral::Parameter& param);
|
||||
|
||||
/* The editor calls these when mapping an operation across multiple tracks */
|
||||
|
@ -1320,3 +1320,20 @@ TimeAxisView::preset_height (Height h)
|
||||
/* NOTREACHED */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/** @return Child time axis views that are not hidden */
|
||||
TimeAxisView::Children
|
||||
TimeAxisView::get_child_list ()
|
||||
{
|
||||
Children c;
|
||||
|
||||
for (Children::iterator i = children.begin(); i != children.end(); ++i) {
|
||||
if (!(*i)->hidden()) {
|
||||
c.push_back(*i);
|
||||
}
|
||||
}
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
|
||||
|
@ -212,6 +212,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
|
||||
virtual StreamView* view () const { return 0; }
|
||||
|
||||
typedef std::vector<boost::shared_ptr<TimeAxisView> > Children;
|
||||
Children get_child_list ();
|
||||
|
||||
SelectionRect* get_selection_rect(uint32_t id);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user