ardour/livetrax
13
0
Fork 0
Code

Thought-to-be-fix for #2794; fix route process order sorting.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8064 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-11-21 00:51:56 +00:00
parent e3fc510d16
commit ca248db48e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libs/ardour/session.cc
View File

@ -1298,10 +1298,13 @@ Session::set_default_fade (float /*steepness*/, float /*fade_msecs*/)
}
struct RouteSorter {
/** @return true to run r1 before r2, otherwise false */
bool operator() (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> r2) {
if (r2->feeds (r1)) {
/* r1 fed by r2; run r2 early */
return false;
} else if (r1->feeds (r2)) {
/* r2 fed by r1; run r1 early */
return true;
} else {
if (r1->not_fed ()) {
@ -1313,10 +1316,16 @@ struct RouteSorter {
return true;
}
} else {
if (r2->not_fed()) {
/* r1 has connections, r2 does not; run r2 early */
return false;
} else {
/* both r1 and r2 have connections, but not to each other. just use signal order */
return r1->order_key(N_("signal")) < r2->order_key(N_("signal"));
}
}
}
}
};
static void