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/selection.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/selection.cc')
| -rw-r--r-- | gtk2_ardour/selection.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index da706a34d7..d2f1a67476 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -45,6 +45,7 @@ struct AudioRangeComparator { } }; +#if 0 Selection& Selection::operator= (const Selection& other) { @@ -58,6 +59,7 @@ Selection::operator= (const Selection& other) } return *this; } +#endif bool operator== (const Selection& a, const Selection& b) @@ -207,7 +209,7 @@ Selection::toggle (TimeAxisView* track) if ((i = find (tracks.begin(), tracks.end(), track)) == tracks.end()) { void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - track->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, pmf), track)); + track->GoingAway.connect (boost::bind (pmf, this, track)); tracks.push_back (track); } else { tracks.erase (i); @@ -336,7 +338,7 @@ Selection::add (const TrackViewList& track_list) for (list<TimeAxisView*>::const_iterator i = added.begin(); i != added.end(); ++i) { void (Selection::*pmf)(TimeAxisView*) = &Selection::remove; - (*i)->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, pmf), (*i))); + scoped_connect ((*i)->GoingAway, boost::bind (pmf, this, (*i))); } if (!added.empty()) { @@ -947,7 +949,7 @@ Selection::add (Marker* m) void (Selection::*pmf)(Marker*) = &Selection::remove; - m->GoingAway.connect (sigc::bind (sigc::mem_fun (*this, pmf), m)); + scoped_connect (m->GoingAway, boost::bind (pmf, this, m)); markers.push_back (m); MarkersChanged(); |