ardour/livetrax
13
0
Fork 0
Code

Sort session routes before trying to do the group tabs

Browse Source 
collection; should fix #4500.


git-svn-id: svn://localhost/ardour2/branches/3.0@10749 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-21 22:38:44 +00:00
parent 322684b94f
commit 6de0f8a8a8
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk2_ardour/group_tabs.cc
View File

@ -432,13 +432,24 @@ GroupTabs::subgroup (RouteGroup* g, bool aux, Placement placement)
}
struct CollectSorter {
CollectSorter (std::string const & key) : _key (key) {}
CollectSorter (string const & key) : _key (key) {}
bool operator () (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
return a->order_key (_key) < b->order_key (_key);
}
std::string _key;
string _key;
};
struct OrderSorter {
OrderSorter (string const & key) : _key (key) {}
bool operator() (boost::shared_ptr<Route> a, boost::shared_ptr<Route> b) {
/* use of ">" forces the correct sort order */
return a->order_key (_key) < b->order_key (_key);
}
string _key;
};
/** Collect all members of a RouteGroup so that they are together in the Editor or Mixer.
@ -453,6 +464,7 @@ GroupTabs::collect (RouteGroup* g)
RouteList::iterator i = group_routes->begin ();
boost::shared_ptr<RouteList> routes = _session->get_routes ();
routes->sort (OrderSorter (order_key ()));
RouteList::const_iterator j = routes->begin ();
int diff = 0;