summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2017-07-24 21:54:31 +0200
committerRobin Gareus <robin@gareus.org>2017-07-24 21:54:31 +0200
commite838e7f3597678e67e712daf21d7af1f7eed35ac (patch)
tree649fc8ec4bb058fd9ba0c4642f143e990947da03
parenta41198305ebb727e02a2b9e0d973b963f51b93fe (diff)
Fix Mixbus "well known" send-names and enable ctrls
-rw-r--r--libs/ardour/route.cc21
1 files 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<ARDOUR::PluginInsert> 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<ARDOUR::PluginInsert> 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<Processor> p = nth_send (n);
if (p) {
return p->name();