diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-23 13:41:20 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-23 13:41:20 -0500 |
| commit | 7000afdc66c9e0ae8dcf9ec080517dabba1e7f34 (patch) | |
| tree | 19574ed8a1fbafa6bed222d8cf817ee1c8098314 /libs/ardour/ardour/internal_send.h | |
| parent | 065e1e63342633f72725a5309926f71c87804293 (diff) | |
| parent | 40d8c5ae01f25e02457c554170a53d537246a7d4 (diff) | |
fix merge conflict with master
Diffstat (limited to 'libs/ardour/ardour/internal_send.h')
| -rw-r--r-- | libs/ardour/ardour/internal_send.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h index 9bfbc4c659..a06bf39906 100644 --- 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; |