diff options
| author | Robin Gareus <robin@gareus.org> | 2014-01-22 13:06:58 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-01-22 13:06:58 +0100 |
| commit | 06cc5e5240cc2bfeb4e22c742a5705566bd11dbe (patch) | |
| tree | 6729edc1e019cf37243be380feb15b560066edc6 /libs/ardour/ardour/send.h | |
| parent | ecc1599474fcf18a55fd603c6ee710c7dced272e (diff) | |
fix bitslot already in use warning
in e45151b89c64 route.cc was changed to create internal sends
directly with role = Delivery::Aux; and not Delivery::Role (0).
This change was motivated to initialize the panner for Aux-sends
in the Delivery.
Role(0) was used to override bitslot numbering during initial
construction of the object when the state is loaded from XML after
construction.
This patch adds an explicit flag for that.
(The previous Role(0) approach only worked for Aux-Sends
but not Sends, anyway.)
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 118110f05a..6e2775286d 100644 --- a/libs/ardour/ardour/send.h +++ b/libs/ardour/ardour/send.h @@ -35,7 +35,7 @@ class Amp; class 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 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; |