merge with master and fix 4 conflicts by hand

[ardour.git] / libs / ardour / ardour / internal_send.h

diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h
index 8636a805db5cc661f8965ce4b08dbb5a753cbf35..a06bf399065a8c646712813d78a6c702662795b6 100644 (file)
--- a/libs/ardour/ardour/internal_send.h
+++ b/libs/ardour/ardour/internal_send.h
@@ -28,7 +28,7 @@ namespace ARDOUR {
 class LIBARDOUR_API InternalSend : public Send
 {
   public:
-       InternalSend (Session&, boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster>, boost::shared_ptr<Route> send_to, Delivery::Role role);
+       InternalSend (Session&, boost::shared_ptr<Pannable>, boost::shared_ptr<MuteMaster>, boost::shared_ptr<Route> send_to, Delivery::Role role = Delivery::Aux, bool ignore_bitslot = false);
        virtual ~InternalSend ();
 
        std::string display_name() const;
@@ -70,6 +70,7 @@ class LIBARDOUR_API InternalSend : public Send
        int  connect_when_legal ();
        void init_gain ();
        int  use_target (boost::shared_ptr<Route>);
+       void target_io_changed ();
 };
 
 } // namespace ARDOUR