diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-19 20:26:31 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-19 20:26:31 +0000 |
| commit | aae367b63c9b619db1e40f27dc334c6987219481 (patch) | |
| tree | 142f6ffed6bb749e24a06343587cad6b966888bd /libs/ardour/route.cc | |
| parent | 67460c2af45d0455e64623572480c064445c2e5b (diff) | |
use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 154c5fd0a0..eeb8ae83c1 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -63,7 +63,7 @@ using namespace ARDOUR; using namespace PBD; uint32_t Route::order_key_cnt = 0; -boost::signals2::signal<void(string const&)> Route::SyncOrderKeys; +PBD::Signal1<void,string const&> Route::SyncOrderKeys; Route::Route (Session& sess, string name, Flag flg, DataType default_type) : SessionObject (sess, name) @@ -93,7 +93,7 @@ Route::Route (Session& sess, string name, Flag flg, DataType default_type) /* now that we have _meter, its safe to connect to this */ - scoped_connect (Metering::Meter, (boost::bind (&Route::meter, this))); + Metering::Meter.connect (*this, (boost::bind (&Route::meter, this))); } Route::Route (Session& sess, const XMLNode& node, DataType default_type) @@ -109,7 +109,7 @@ Route::Route (Session& sess, const XMLNode& node, DataType default_type) /* now that we have _meter, its safe to connect to this */ - scoped_connect (Metering::Meter, (boost::bind (&Route::meter, this))); + Metering::Meter.connect (*this, (boost::bind (&Route::meter, this))); } void @@ -147,8 +147,8 @@ Route::init () _input.reset (new IO (_session, _name, IO::Input, _default_type)); _output.reset (new IO (_session, _name, IO::Output, _default_type)); - scoped_connect (_input->changed, boost::bind (&Route::input_change_handler, this, _1, _2)); - scoped_connect (_output->changed, boost::bind (&Route::output_change_handler, this, _1, _2)); + _input->changed.connect (*this, boost::bind (&Route::input_change_handler, this, _1, _2)); + _output->changed.connect (*this, boost::bind (&Route::output_change_handler, this, _1, _2)); /* add amp processor */ @@ -792,7 +792,7 @@ Route::add_processor (boost::shared_ptr<Processor> processor, ProcessorList::ite // XXX: do we want to emit the signal here ? change call order. processor->activate (); } - scoped_connect (processor->ActiveChanged, boost::bind (&Session::update_latency_compensation, &_session, false, false)); + processor->ActiveChanged.connect (*this, boost::bind (&Session::update_latency_compensation, &_session, false, false)); _output->set_user_latency (0); } @@ -1047,7 +1047,7 @@ Route::add_processors (const ProcessorList& others, ProcessorList::iterator iter return -1; } - scoped_connect ((*i)->ActiveChanged, boost::bind (&Session::update_latency_compensation, &_session, false, false)); + (*i)->ActiveChanged.connect (*this, boost::bind (&Session::update_latency_compensation, &_session, false, false)); } _output->set_user_latency (0); |