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 /gtk2_ardour/location_ui.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 'gtk2_ardour/location_ui.cc')
| -rw-r--r-- | gtk2_ardour/location_ui.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index 328d87b544..61a0ec1405 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -282,11 +282,11 @@ LocationEditRow::set_location (Location *loc) end_clock.set_sensitive (!location->locked()); length_clock.set_sensitive (!location->locked()); - connections.add_connection (location->start_changed.connect (boost::bind (&LocationEditRow::start_changed, this, _1))); - connections.add_connection (location->end_changed.connect (boost::bind (&LocationEditRow::end_changed, this, _1))); - connections.add_connection (location->name_changed.connect (boost::bind (&LocationEditRow::name_changed, this, _1))); - connections.add_connection (location->changed.connect (boost::bind (&LocationEditRow::location_changed, this, _1))); - connections.add_connection (location->FlagsChanged.connect (boost::bind (&LocationEditRow::flags_changed, this, _1, _2))); + location->start_changed.connect (connections, boost::bind (&LocationEditRow::start_changed, this, _1)); + location->end_changed.connect (connections, boost::bind (&LocationEditRow::end_changed, this, _1)); + location->name_changed.connect (connections, boost::bind (&LocationEditRow::name_changed, this, _1)); + location->changed.connect (connections, boost::bind (&LocationEditRow::location_changed, this, _1)); + location->FlagsChanged.connect (connections, boost::bind (&LocationEditRow::flags_changed, this, _1, _2)); } void @@ -860,10 +860,10 @@ LocationUI::set_session(ARDOUR::Session* s) SessionHandlePtr::set_session (s); if (_session) { - _session_connections.add_connection (_session->locations()->changed.connect (boost::bind (&LocationUI::refresh_location_list, this))); - _session_connections.add_connection (_session->locations()->StateChanged.connect (boost::bind (&LocationUI::refresh_location_list, this))); - _session_connections.add_connection (_session->locations()->added.connect (boost::bind (&LocationUI::location_added, this, _1))); - _session_connections.add_connection (_session->locations()->removed.connect (boost::bind (&LocationUI::location_removed, this, _1))); + _session->locations()->changed.connect (_session_connections, boost::bind (&LocationUI::refresh_location_list, this)); + _session->locations()->StateChanged.connect (_session_connections, boost::bind (&LocationUI::refresh_location_list, this)); + _session->locations()->added.connect (_session_connections, boost::bind (&LocationUI::location_added, this, _1)); + _session->locations()->removed.connect (_session_connections, boost::bind (&LocationUI::location_removed, this, _1)); } refresh_location_list (); |