allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

typedef for a DAGVertex.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10508 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington
2011-11-09 17:43:32 +00:00
parent 17da9339c2
commit 9a734cd4b8
2 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/ardour/ardour/route_dag.h
View File

@@ -23,21 +23,23 @@
namespace ARDOUR {
typedef boost::shared_ptr<Route> DAGVertex;
/** A list of edges for a directed acyclic graph for routes */
class DAGEdges
{
public:
typedef std::map<boost::shared_ptr<Route>, std::set<boost::shared_ptr<Route> > > EdgeMap;
typedef std::map<DAGVertex, std::set<DAGVertex> > EdgeMap;
void add (boost::shared_ptr<Route> from, boost::shared_ptr<Route> to);
std::set<boost::shared_ptr<Route> > from (boost::shared_ptr<Route> r) const;
void remove (boost::shared_ptr<Route> from, boost::shared_ptr<Route> to);
bool has_none_to (boost::shared_ptr<Route> to) const;
void add (DAGVertex from, DAGVertex to);
std::set<DAGVertex> from (DAGVertex r) const;
void remove (DAGVertex from, DAGVertex to);
bool has_none_to (DAGVertex to) const;
bool empty () const;
void dump () const;
private:
void insert (EdgeMap& e, boost::shared_ptr<Route> a, boost::shared_ptr<Route> b);
void insert (EdgeMap& e, DAGVertex a, DAGVertex b);
/* Keep a map in both directions to speed lookups */

30
libs/ardour/route_dag.cc
View File

@@ -27,7 +27,7 @@ using namespace std;
using namespace ARDOUR;
void
DAGEdges::add (boost::shared_ptr<Route> from, boost::shared_ptr<Route> to)
DAGEdges::add (DAGVertex from, DAGVertex to)
{
insert (_from_to, from, to);
insert (_to_from, to, from);
@@ -36,26 +36,26 @@ DAGEdges::add (boost::shared_ptr<Route> from, boost::shared_ptr<Route> to)
if (i != _from_to.end ()) {
i->second.insert (to);
} else {
set<boost::shared_ptr<Route> > v;
set<DAGVertex> v;
v.insert (to);
_from_to.insert (make_pair (from, v));
}
}
set<boost::shared_ptr<Route> >
DAGEdges::from (boost::shared_ptr<Route> r) const
set<DAGVertex>
DAGEdges::from (DAGVertex r) const
{
EdgeMap::const_iterator i = _from_to.find (r);
if (i == _from_to.end ()) {
return set<boost::shared_ptr<Route> > ();
return set<DAGVertex> ();
}
return i->second;
}
void
DAGEdges::remove (boost::shared_ptr<Route> from, boost::shared_ptr<Route> to)
DAGEdges::remove (DAGVertex from, DAGVertex to)
{
EdgeMap::iterator i = _from_to.find (from);
assert (i != _from_to.end ());
@@ -77,7 +77,7 @@ DAGEdges::remove (boost::shared_ptr<Route> from, boost::shared_ptr<Route> to)
*/
bool
DAGEdges::has_none_to (boost::shared_ptr<Route> to) const
DAGEdges::has_none_to (DAGVertex to) const
{
return _to_from.find (to) == _to_from.end ();
}
@@ -94,7 +94,7 @@ DAGEdges::dump () const
{
for (EdgeMap::const_iterator i = _from_to.begin(); i != _from_to.end(); ++i) {
cout << "FROM: " << i->first->name() << " ";
for (set<boost::shared_ptr<Route> >::const_iterator j = i->second.begin(); j != i->second.end(); ++j) {
for (set<DAGVertex>::const_iterator j = i->second.begin(); j != i->second.end(); ++j) {
cout << (*j)->name() << " ";
}
cout << "\n";
@@ -102,7 +102,7 @@ DAGEdges::dump () const
for (EdgeMap::const_iterator i = _to_from.begin(); i != _to_from.end(); ++i) {
cout << "TO: " << i->first->name() << " ";
for (set<boost::shared_ptr<Route> >::const_iterator j = i->second.begin(); j != i->second.end(); ++j) {
for (set<DAGVertex>::const_iterator j = i->second.begin(); j != i->second.end(); ++j) {
cout << (*j)->name() << " ";
}
cout << "\n";
@@ -110,13 +110,13 @@ DAGEdges::dump () const
}
void
DAGEdges::insert (EdgeMap& e, boost::shared_ptr<Route> a, boost::shared_ptr<Route> b)
DAGEdges::insert (EdgeMap& e, DAGVertex a, DAGVertex b)
{
EdgeMap::iterator i = e.find (a);
if (i != e.end ()) {
i->second.insert (b);
} else {
set<boost::shared_ptr<Route> > v;
set<DAGVertex> v;
v.insert (b);
e.insert (make_pair (a, v));
}
@@ -124,7 +124,7 @@ DAGEdges::insert (EdgeMap& e, boost::shared_ptr<Route> a, boost::shared_ptr<Rout
struct RouteRecEnabledComparator
{
bool operator () (boost::shared_ptr<Route> r1, boost::shared_ptr<Route> r2) const
bool operator () (DAGVertex r1, DAGVertex r2) const
{
if (r1->record_enabled()) {
if (r2->record_enabled()) {
@@ -176,11 +176,11 @@ ARDOUR::topological_sort (
*/
while (!queue.empty ()) {
boost::shared_ptr<Route> r = queue.front ();
DAGVertex r = queue.front ();
queue.pop_front ();
sorted_routes->push_back (r);
set<boost::shared_ptr<Route> > e = edges.from (r);
for (set<boost::shared_ptr<Route> >::iterator i = e.begin(); i != e.end(); ++i) {
set<DAGVertex> e = edges.from (r);
for (set<DAGVertex>::iterator i = e.begin(); i != e.end(); ++i) {
edges.remove (r, *i);
if (edges.has_none_to (*i)) {
queue.push_back (*i);