diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-29 13:02:00 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-29 13:02:00 -0500 |
| commit | 17301b87f95f0bc1f5ea266eac272f135c812fc3 (patch) | |
| tree | d5f74b0f9c16073eb1153fcd985d2eb7850653f0 | |
| parent | 39a61dba8324e6a92c303b7296cb0a7a7cc40145 (diff) | |
mixbus: don't assert(ch_post()) in case we use various methods on "odd" Routes in the future
| -rw-r--r-- | libs/ardour/route.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index fb417305d7..76c4b1af45 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -5151,7 +5151,9 @@ Route::pan_azimuth_control() const { #ifdef MIXBUS boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post(); - assert (plug); + if (!plug) { + return boost::shared_ptr<AutomationControl>(); + } const uint32_t port_channel_post_pan = 2; // gtk2_ardour/mixbus_ports.h return boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (plug->control (Evoral::Parameter (ARDOUR::PluginAutomation, 0, port_channel_post_pan))); #else @@ -5510,7 +5512,9 @@ Route::send_level_controllable (uint32_t n) const { #ifdef MIXBUS boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post(); - assert (plug); + if (!plug) { + return boost::shared_ptr<AutomationControl>(); + } if (n >= 8) { /* no such bus */ @@ -5533,7 +5537,9 @@ Route::send_enable_controllable (uint32_t n) const { #ifdef MIXBUS boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post(); - assert (plug); + if (!plug) { + return boost::shared_ptr<AutomationControl>(); + } if (n >= 8) { /* no such bus */ @@ -5577,7 +5583,9 @@ Route::master_send_enable_controllable () const { #ifdef MIXBUS boost::shared_ptr<ARDOUR::PluginInsert> plug = ch_post(); - assert (plug); + if (!plug) { + return boost::shared_ptr<AutomationControl>(); + } return boost::dynamic_pointer_cast<ARDOUR::AutomationControl> (plug->control (Evoral::Parameter (ARDOUR::PluginAutomation, 0, port_channel_post_mstr_assign))); #else return boost::shared_ptr<AutomationControl>(); |