ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Move get_child_list() into TimeAxisView.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7574 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-08-09 17:27:56 +00:00
parent 5b520324ce
commit 3600f60a03
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gtk2_ardour/editor.cc
View File

@ -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;
}
}

14
gtk2_ardour/route_time_axis.cc
View File

@ -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();

2
gtk2_ardour/route_time_axis.h
View File

@ -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 */

17
gtk2_ardour/time_axis_view.cc
View File

@ -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;
}

1
gtk2_ardour/time_axis_view.h
View File

@ -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);