diff options
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index b28f83c477..4b4e450c34 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -206,8 +206,6 @@ Route::init () /* now that we have _meter, its safe to connect to this */ - Metering::Meter.connect_same_thread (*this, (boost::bind (&Route::meter, this))); - { Glib::Threads::Mutex::Lock lx (AudioEngine::instance()->process_lock ()); configure_processors (0); @@ -1915,7 +1913,7 @@ Route::configure_processors_unlocked (ProcessorStreams* err) if (_meter) { - _meter->reset_max_channels (processor_max_streams); + _meter->set_max_channels (processor_max_streams); } /* make sure we have sufficient scratch buffers to cope with the new processor @@ -4021,28 +4019,6 @@ Route::set_active (bool yn, void* src) } } -void -Route::meter () -{ - Glib::Threads::RWLock::ReaderLock rm (_processor_lock); - - assert (_meter); - - _meter->meter (); - - for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) { - - boost::shared_ptr<Send> s; - boost::shared_ptr<Return> r; - - if ((s = boost::dynamic_pointer_cast<Send> (*i)) != 0) { - s->meter()->meter(); - } else if ((r = boost::dynamic_pointer_cast<Return> (*i)) != 0) { - r->meter()->meter (); - } - } -} - boost::shared_ptr<Pannable> Route::pannable() const { |