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/send.cc | |
| 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/send.cc')
| -rw-r--r-- | libs/ardour/send.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index 1664f42b35..71cab46879 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -44,9 +44,9 @@ using namespace PBD; using namespace std; string -Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot) +Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot, bool ignore_bitslot) { - if (r == Role (0)) { + if (ignore_bitslot) { /* this happens during initial construction of sends from XML, before they get ::set_state() called. lets not worry about it. @@ -70,8 +70,8 @@ Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot) } -Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMaster> mm, Role r) - : Delivery (s, p, mm, name_and_id_new_send (s, r, _bitslot), r) +Send::Send (Session& s, boost::shared_ptr<Pannable> p, boost::shared_ptr<MuteMaster> mm, Role r, bool ignore_bitslot) + : Delivery (s, p, mm, name_and_id_new_send (s, r, _bitslot, ignore_bitslot), r) , _metering (false) { if (_role == Listen) { |