projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
39a61db
)
mixbus: don't assert(ch_post()) in case we use various methods on "odd" Routes in...
author
Paul Davis
<paul@linuxaudiosystems.com>
Fri, 29 Jan 2016 18:02:00 +0000
(13:02 -0500)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Fri, 29 Jan 2016 18:02:00 +0000
(13:02 -0500)
libs/ardour/route.cc
patch
|
blob
|
history
diff --git
a/libs/ardour/route.cc
b/libs/ardour/route.cc
index fb417305d75e6266872e0868d89007035ac3531d..76c4b1af45285e6d8542490df6dd5e8840c158b0 100644
(file)
--- 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();
{
#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
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();
{
#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 */
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();
{
#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 */
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();
{
#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>();
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>();