add new Graph debug bit ; make adding aux sends really work

git-svn-id: svn://localhost/ardour2/branches/3.0@6132 d708f5d6-7413-0410-9779-e7cbd77b26cf

5 files changed, 15 insertions, 10 deletions

diff --git a/libs/ardour/ardour/debug.h b/libs/ardour/ardour/debug.h
index 926d5520d7..f31c42675e 100644
--- a/libs/ardour/ardour/debug.h
+++ b/libs/ardour/ardour/debug.h
@@ -41,7 +41,8 @@ namespace ARDOUR {
 			SnapBBT = 0x8,
 			Configuration = 0x10,
 			Latency = 0x20,
-			Processors = 0x40
+			Processors = 0x40,
+			Graph = 0x80
 		};
 	}
 
diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 3494be2cf5..a3d8903f34 100644
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -362,6 +362,8 @@ Delivery::state (bool full_state)
 		node.add_property("type", "delivery");
 	}
 
+	std::cerr << "delivery " << _name << " storing role " << _role << " as " << enum_2_string (_role) << std::endl;
+
 	node.add_property("role", enum_2_string(_role));
 	node.add_child_nocopy (_panner->state (full_state));
 
diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc
index d70889a27c..dd67d541ea 100644
--- a/libs/ardour/internal_send.cc
+++ b/libs/ardour/internal_send.cc
@@ -109,7 +109,6 @@ InternalSend::run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
 		Amp::apply_simple_gain (mixbufs, nframes, tgain);
 	}
 
-
 	// Can't automate gain for sends or returns yet because we need different buffers
 	// so that we don't overwrite the main automation data for the route amp
 	// _amp->setup_gain_automation (start_frame, end_frame, nframes);
@@ -153,7 +152,7 @@ InternalSend::state (bool full)
 {
 	XMLNode& node (Send::state (full));
 
-	/* this replaces any existing property */
+	/* this replaces any existing "type" property */
 
 	node.add_property ("type", "intsend");
 
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index e0543bdda9..02890808b7 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -2399,11 +2399,10 @@ Route::set_comment (string cmt, void *src)
 bool
 Route::feeds (boost::shared_ptr<Route> other, bool* only_send)
 {
-	// cerr << _name << endl;
+	DEBUG_TRACE (DEBUG::Graph, string_compose ("Feeds? %1\n", _name));
 
 	if (_output->connected_to (other->input())) {
-		// cerr << "\tdirect FEEDS " << other->name() << endl;
-
+		DEBUG_TRACE (DEBUG::Graph, string_compose ("\tdirect FEEDS %2\n", other->name()));
 		if (only_send) {
 			*only_send = false;
 		}
@@ -2418,18 +2417,21 @@ Route::feeds (boost::shared_ptr<Route> other, bool* only_send)
 
 		if ((iop = boost::dynamic_pointer_cast<IOProcessor>(*r)) != 0) {
 			if (iop->feeds (other)) {
-				// cerr << "\tIOP " << iop->name() << " feeds " << other->name() << endl;
+				DEBUG_TRACE (DEBUG::Graph,  string_compose ("\tIOP %1 does feed %2\n", iop->name(), other->name()));
 				if (only_send) {
 					*only_send = true;
 				}
 				return true;
 			} else {
-				// cerr << "\tIOP " << iop->name() << " does NOT feeds " << other->name() << endl;
+				DEBUG_TRACE (DEBUG::Graph,  string_compose ("\tIOP %1 does NOT feed %2\n", iop->name(), other->name()));
 			}
+		} else {
+			DEBUG_TRACE (DEBUG::Graph,  string_compose ("\tPROC %1 is not an IOP\n", (*r)->name()));
 		}
+			
 	}
 
-	// cerr << "\tdoes NOT FEED " << other->name() << endl;
+	DEBUG_TRACE (DEBUG::Graph,  string_compose ("\tdoes NOT feed %1\n", other->name()));
 	return false;
 }
 
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 7edde902ea..0d5cdcacb5 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -2258,7 +2258,6 @@ Session::globally_add_internal_sends (boost::shared_ptr<Route> dest, Placement p
 	add_internal_sends (dest, p, t);
 }
 
-
 void
 Session::add_internal_sends (boost::shared_ptr<Route> dest, Placement p, boost::shared_ptr<RouteList> senders)
 {
@@ -2278,6 +2277,8 @@ Session::add_internal_sends (boost::shared_ptr<Route> dest, Placement p, boost::
 
 		(*i)->listen_via (dest, p, true, true);
 	}
+
+	graph_reordered ();
 }
 
 void