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/send.h | |
parent | 065e1e63342633f72725a5309926f71c87804293 (diff) | |
parent | 40d8c5ae01f25e02457c554170a53d537246a7d4 (diff) |
fix merge conflict with master
Diffstat (limited to 'libs/ardour/ardour/send.h')
-rw-r--r-- | libs/ardour/ardour/send.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h index 9b30dcf792..a9d2c5dacd 100644 --- a/libs/ardour/ardour/send.h +++ b/libs/ardour/ardour/send.h @@ -35,7 +35,7 @@ class Amp; class LIBARDOUR_API Send : public Delivery { public: - Send (Session&, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send); + Send (Session&, boost::shared_ptr<Pannable> pannable, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send, bool ignore_bitslot = false); virtual ~Send (); uint32_t bit_slot() const { return _bitslot; } @@ -67,7 +67,7 @@ class LIBARDOUR_API Send : public Delivery std::string value_as_string (boost::shared_ptr<AutomationControl>) const; static uint32_t how_many_sends(); - static std::string name_and_id_new_send (Session&, Delivery::Role r, uint32_t&); + static std::string name_and_id_new_send (Session&, Delivery::Role r, uint32_t&, bool); protected: bool _metering; |