projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into cairocanvas
[ardour.git]
/
libs
/
ardour
/
route_graph.cc
diff --git
a/libs/ardour/route_graph.cc
b/libs/ardour/route_graph.cc
index 13264ff9fa342c210a0771273304b3e7e7643629..ee02afef2401710aaca5a8987a612d98e1386c06 100644
(file)
--- a/
libs/ardour/route_graph.cc
+++ b/
libs/ardour/route_graph.cc
@@
-170,7
+170,7
@@
struct RouteRecEnabledComparator
if (r1->record_enabled()) {
if (r2->record_enabled()) {
/* both rec-enabled, just use signal order */
if (r1->record_enabled()) {
if (r2->record_enabled()) {
/* both rec-enabled, just use signal order */
- return r1->order_key (
MixerSort) < r2->order_key (MixerSort
);
+ return r1->order_key (
) < r2->order_key (
);
} else {
/* r1 rec-enabled, r2 not rec-enabled, run r2 early */
return false;
} else {
/* r1 rec-enabled, r2 not rec-enabled, run r2 early */
return false;
@@
-181,7
+181,7
@@
struct RouteRecEnabledComparator
return true;
} else {
/* neither rec-enabled, use signal order */
return true;
} else {
/* neither rec-enabled, use signal order */
- return r1->order_key (
MixerSort) < r2->order_key (MixerSort
);
+ return r1->order_key (
) < r2->order_key (
);
}
}
}
}
}
}