diff options
| -rw-r--r-- | libs/ardour/audio_unit.cc | 3 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index fd975ba409..4a0b7dfa4b 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -189,7 +189,7 @@ static CFPropertyListRef load_property_list (Glib::ustring path) { int fd; - CFPropertyListRef propertyList; + CFPropertyListRef propertyList = 0; CFDataRef xmlData; CFStringRef errorString; @@ -1267,7 +1267,6 @@ AUPlugin::connect_and_run (vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, } // cerr << name() << " render error " << err << endl; - return -1; } diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 3ae80ede9c..454d29ab4d 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -2020,8 +2020,9 @@ Route::silence (nframes_t nframes) if (lm.locked()) { for (RedirectList::iterator i = _redirects.begin(); i != _redirects.end(); ++i) { - boost::shared_ptr<PluginInsert> pi; - if (!_active && (pi = boost::dynamic_pointer_cast<PluginInsert> (*i)) != 0) { + boost::shared_ptr<PluginInsert> pi = boost::dynamic_pointer_cast<PluginInsert> (*i); + + if (!_active && pi) { // skip plugins, they don't need anything when we're not active continue; } |