diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
| commit | f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe (patch) | |
| tree | 5214c580b9e6c17a499fa587660dbf949e892bf2 /gtk2_ardour/editor_regions.cc | |
| parent | da762129f19c28aff64f833b6ec09fba946faef6 (diff) | |
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_regions.cc')
| -rw-r--r-- | gtk2_ardour/editor_regions.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index 8aa6d94192..2501f93726 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -130,13 +130,15 @@ EditorRegions::EditorRegions (Editor* e) } void -EditorRegions::connect_to_session (ARDOUR::Session* s) +EditorRegions::set_session (ARDOUR::Session* s) { - EditorComponent::connect_to_session (s); + EditorComponent::set_session (s); - _session_connections.push_back (_session->RegionsAdded.connect (sigc::mem_fun(*this, &EditorRegions::handle_new_regions))); - _session_connections.push_back (_session->RegionRemoved.connect (sigc::mem_fun(*this, &EditorRegions::handle_region_removed))); - _session_connections.push_back (_session->RegionHiddenChange.connect (sigc::mem_fun(*this, &EditorRegions::region_hidden))); + if (_session) { + _session_connections.add_connection (_session->RegionsAdded.connect (boost::bind (&EditorRegions::handle_new_regions, this, _1))); + _session_connections.add_connection (_session->RegionRemoved.connect (boost::bind (&EditorRegions::handle_region_removed, this, _1))); + _session_connections.add_connection (_session->RegionHiddenChange.connect (boost::bind (&EditorRegions::region_hidden, this, _1))); + } redisplay (); } |