Fix Mixbus "well known" send-names and enable ctrls

This commit is contained in:
Robin Gareus
2017-07-24 21:54:31 +02:00
parent a41198305e
commit e838e7f359

View File

@@ -5386,7 +5386,7 @@ Route::send_enable_controllable (uint32_t n) const
# undef MIXBUS_PORTS_H # undef MIXBUS_PORTS_H
# include "../../gtk2_ardour/mixbus_ports.h" # include "../../gtk2_ardour/mixbus_ports.h"
boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post(); boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post();
if (plug) { if (plug && !mixbus()) {
uint32_t port_id = 0; uint32_t port_id = 0;
switch (n) { switch (n) {
case 0: port_id = port_channel_post_aux1_asgn; break; case 0: port_id = port_channel_post_aux1_asgn; break;
@@ -5431,18 +5431,21 @@ string
Route::send_name (uint32_t n) const Route::send_name (uint32_t n) const
{ {
#ifdef MIXBUS #ifdef MIXBUS
boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post();
if (plug && !mixbus()) {
# ifdef MIXBUS32C # ifdef MIXBUS32C
if (n < 12) { if (n < 12) {
return _session.get_mixbus (n)->name(); return _session.get_mixbus (n)->name();
} }
n -= 12; n -= 12;
#else #else
if (n < 8) { if (n < 8) {
return _session.get_mixbus (n)->name(); return _session.get_mixbus (n)->name();
} }
n -= 8; n -= 8;
# endif # endif
#endif #endif
}
boost::shared_ptr<Processor> p = nth_send (n); boost::shared_ptr<Processor> p = nth_send (n);
if (p) { if (p) {
return p->name(); return p->name();