smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 21:55:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix name and a comment.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10483 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-07 22:39:16 +00:00
parent 0ea7ceb1d9
commit b2e6746f10
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/route_dag.h
View file

@ -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
);

7
libs/ardour/route_dag.cc
View file

@ -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.

2
libs/ardour/session.cc
View file

@ -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