From e838e7f3597678e67e712daf21d7af1f7eed35ac Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Mon, 24 Jul 2017 21:54:31 +0200 Subject: Fix Mixbus "well known" send-names and enable ctrls --- libs/ardour/route.cc | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 2c5cda55a1..5af7f0e322 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -5386,7 +5386,7 @@ Route::send_enable_controllable (uint32_t n) const # undef MIXBUS_PORTS_H # include "../../gtk2_ardour/mixbus_ports.h" boost::shared_ptr plug = ch_post(); - if (plug) { + if (plug && !mixbus()) { uint32_t port_id = 0; switch (n) { case 0: port_id = port_channel_post_aux1_asgn; break; @@ -5431,18 +5431,21 @@ string Route::send_name (uint32_t n) const { #ifdef MIXBUS + boost::shared_ptr plug = ch_post(); + if (plug && !mixbus()) { # ifdef MIXBUS32C - if (n < 12) { - return _session.get_mixbus (n)->name(); - } - n -= 12; + if (n < 12) { + return _session.get_mixbus (n)->name(); + } + n -= 12; #else - if (n < 8) { - return _session.get_mixbus (n)->name(); - } - n -= 8; + if (n < 8) { + return _session.get_mixbus (n)->name(); + } + n -= 8; # endif #endif + } boost::shared_ptr p = nth_send (n); if (p) { return p->name(); -- cgit v1.2.3