diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-11-07 22:39:16 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-11-07 22:39:16 +0000 |
| commit | b2e6746f107694b2ebcd5b037dfa3e410b523a01 (patch) | |
| tree | cf082122cd23f84b5d7644658b85d91704ac460f | |
| parent | 0ea7ceb1d964ec24467cf933013f81cc83015471 (diff) | |
Fix name and a comment.
git-svn-id: svn://localhost/ardour2/branches/3.0@10483 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/ardour/route_dag.h | 2 | ||||
| -rw-r--r-- | libs/ardour/route_dag.cc | 7 | ||||
| -rw-r--r-- | libs/ardour/session.cc | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/libs/ardour/ardour/route_dag.h b/libs/ardour/ardour/route_dag.h index d90fb8676f..c75b5d36d6 100644 --- a/libs/ardour/ardour/route_dag.h +++ b/libs/ardour/ardour/route_dag.h @@ -47,7 +47,7 @@ private: EdgeMap _to_from; }; -boost::shared_ptr<RouteList> topographical_sort ( +boost::shared_ptr<RouteList> topological_sort ( boost::shared_ptr<RouteList>, DAGEdges ); diff --git a/libs/ardour/route_dag.cc b/libs/ardour/route_dag.cc index ec1bc72127..9c69fb35db 100644 --- a/libs/ardour/route_dag.cc +++ b/libs/ardour/route_dag.cc @@ -148,7 +148,7 @@ struct RouteRecEnabledComparator boost::shared_ptr<RouteList> -ARDOUR::topographical_sort ( +ARDOUR::topological_sort ( boost::shared_ptr<RouteList> routes, DAGEdges edges ) @@ -165,7 +165,10 @@ ARDOUR::topographical_sort ( } } - /* Sort the initial queue so that non-rec-enabled routes are run first */ + /* Sort the initial queue so that non-rec-enabled routes are run first. + This is so that routes can record things coming from other routes + via external connections. + */ queue.sort (RouteRecEnabledComparator ()); /* Do the sort: algorithm is Kahn's from Wikipedia. diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index a5e6fca564..f901de87cd 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -1347,7 +1347,7 @@ Session::resort_routes_using (boost::shared_ptr<RouteList> r) trace_terminal (*i, *i); } - boost::shared_ptr<RouteList> sorted_routes = topographical_sort (r, edges); + boost::shared_ptr<RouteList> sorted_routes = topological_sort (r, edges); route_graph->rechain (sorted_routes); #ifndef NDEBUG |