7 files changed, 14 insertions, 8 deletions
diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h
index 822d7a2d6d..7be324dba1 100644
--- a/libs/ardour/ardour/amp.h
+++ b/libs/ardour/ardour/amp.h
@@ -39,7 +39,7 @@ public:
 
 	std::string display_name() const;
 
-	bool visible () const { return false; }
+	bool visible () const;
 
 	bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const;
 	bool configure_io (ChanCount in, ChanCount out);
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h
index 1d01acad5f..e46823d075 100644
--- a/libs/ardour/ardour/delivery.h
+++ b/libs/ardour/ardour/delivery.h
@@ -37,7 +37,8 @@ public:
 		Insert = 0x1,
 		Send   = 0x2,
 		Listen = 0x4,
-		Main   = 0x8
+		Main   = 0x8,
+		Aux    = 0x10
 	};
 
 	/* Delivery to an existing output */
diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h
index ea2ffce3fe..3e89b8aec6 100644
--- a/libs/ardour/ardour/internal_send.h
+++ b/libs/ardour/ardour/internal_send.h
@@ -28,10 +28,11 @@ namespace ARDOUR {
 class InternalSend : public Send
 {
   public:	
-	InternalSend (Session&, boost::shared_ptr<MuteMaster>, boost::shared_ptr<Route> send_to);
+	InternalSend (Session&, boost::shared_ptr<MuteMaster>, boost::shared_ptr<Route> send_to, Delivery::Role role);
 	InternalSend (Session&, boost::shared_ptr<MuteMaster>, const XMLNode&);
 	virtual ~InternalSend ();
 
+	std::string display_name() const;
 	bool set_name (const std::string&);
 	bool visible() const;
 
diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h
index 414b559de0..e1fd97f107 100644
--- a/libs/ardour/ardour/meter.h
+++ b/libs/ardour/ardour/meter.h
@@ -53,6 +53,8 @@ public:
 	PeakMeter(Session& s) : Processor(s, "Meter") {}
 	PeakMeter(Session&s, const XMLNode& node);
 
+	bool visible() const;
+
 	void meter();
 
 	void reset ();
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 133ec1eb78..7a44cb454c 100644
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -260,7 +260,7 @@ class Route : public SessionObject, public AutomatableControls
 
 	sigc::signal<void,void*> SelectedChanged;
 	
-	int listen_via (boost::shared_ptr<Route>, bool);
+	int listen_via (boost::shared_ptr<Route>, Placement p, bool active, bool aux);
 	void drop_listen (boost::shared_ptr<Route>);
 
 	bool feeds (boost::shared_ptr<Route>);
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h
index 37d56e2abd..d4b9bca1b3 100644
--- a/libs/ardour/ardour/send.h
+++ b/libs/ardour/ardour/send.h
@@ -37,12 +37,14 @@ class Amp;
 class Send : public Delivery
 {
   public:	
-	Send (Session&, boost::shared_ptr<MuteMaster>, bool internal = false);
-	Send (Session&, boost::shared_ptr<MuteMaster>, const XMLNode&, bool internal = false);
+	Send (Session&, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send);
+	Send (Session&, boost::shared_ptr<MuteMaster>, const XMLNode&, Delivery::Role r = Delivery::Send);
 	virtual ~Send ();
 
 	uint32_t bit_slot() const { return _bitslot; }
 
+	bool visible() const;
+
 	boost::shared_ptr<Amp> amp() const { return _amp; }
 	boost::shared_ptr<PeakMeter> meter() const { return _meter; }
 
diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index 429d30a5c1..7669883185 100644
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -740,8 +740,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
 	boost::shared_ptr<Route> control_out() const { return _control_out; }
 	boost::shared_ptr<Route> master_out() const { return _master_out; }
 
-	void globally_add_internal_sends (boost::shared_ptr<Route> dest);
-	void add_internal_sends (boost::shared_ptr<Route> dest, boost::shared_ptr<RouteList> senders);
+	void globally_add_internal_sends (boost::shared_ptr<Route> dest, Placement p);
+	void add_internal_sends (boost::shared_ptr<Route> dest, Placement p, boost::shared_ptr<RouteList> senders);
 
 	static void set_disable_all_loaded_plugins (bool yn) {
 		_disable_all_loaded_plugins = yn;