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

Fix erroneous setup of order keys when tracks have children: order keys relate to the actual tracks only, and ignore child automation views. Should fix the root cause of #4481.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10664 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-17 23:44:16 +00:00
parent 330e98d6cb
commit aef4f9fb07
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gtk2_ardour/editor_routes.cc
View file

@ -463,9 +463,18 @@ EditorRoutes::redisplay ()
TreeModel::Children rows = _model->children(); TreeModel::Children rows = _model->children();
TreeModel::Children::iterator i; TreeModel::Children::iterator i;
uint32_t position; uint32_t position;
/* n will be the count of tracks plus children (updated by TimeAxisView::show_at),
so we will use that to know where to put things.
*/
int n; int n;
for (n = 0, position = 0, i = rows.begin(); i != rows.end(); ++i) { /* Order keys must not take children into account, so use a separate counter
for that.
*/
int order_key;
for (n = 0, order_key = 0, position = 0, i = rows.begin(); i != rows.end(); ++i) {
TimeAxisView *tv = (*i)[_columns.tv]; TimeAxisView *tv = (*i)[_columns.tv];
boost::shared_ptr<Route> route = (*i)[_columns.route]; boost::shared_ptr<Route> route = (*i)[_columns.route];
@ -478,7 +487,7 @@ EditorRoutes::redisplay ()
/* this reorder is caused by user action, so reassign sort order keys /* this reorder is caused by user action, so reassign sort order keys
to tracks. to tracks.
*/ */
route->set_order_key (N_ ("editor"), n); route->set_order_key (N_ ("editor"), order_key);
} }
bool visible = tv->marked_for_display (); bool visible = tv->marked_for_display ();
@ -492,6 +501,7 @@ EditorRoutes::redisplay ()
} }
n++; n++;
order_key++;
} }
/* whenever we go idle, update the track view list to reflect the new order. /* whenever we go idle, update the track view list to reflect the new order.
@ -1323,6 +1333,12 @@ EditorRoutes::move_selected_tracks (bool up)
neworder.push_back (leading->second->order_key (N_ ("editor"))); neworder.push_back (leading->second->order_key (N_ ("editor")));
} }
#ifndef NDEBUG
for (vector<int>::iterator i = neworder.begin(); i != neworder.end(); ++i) {
assert (*i < (int) neworder.size ());
}
#endif
_model->reorder (neworder); _model->reorder (neworder);
_session->sync_order_keys (N_ ("editor")); _session->sync_order_keys (N_ ("editor"));