diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-12 22:23:01 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2007-11-12 22:23:01 +0000 |
| commit | b01bdb7e70f021da764e81a4b55722e746e4885d (patch) | |
| tree | 3f22af0fc8399bedd6843f7a9a4383295ac7b3cb /gtk2_ardour/selection.cc | |
| parent | 99d002dbdf2563bcad880628e7876aebe191ba0c (diff) | |
merged with trunk revs 2605-2627
git-svn-id: svn://localhost/ardour2/trunk@2628 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/selection.cc')
| -rw-r--r-- | gtk2_ardour/selection.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc index c6bb5c37af..f1511c6ffa 100644 --- a/gtk2_ardour/selection.cc +++ b/gtk2_ardour/selection.cc @@ -741,11 +741,17 @@ Selection::remove (Marker* m) } } - void Selection::add (Marker* m) { if (find (markers.begin(), markers.end(), m) == markers.end()) { + + /* disambiguate which remove() for the compiler */ + + void (Selection::*pmf)(Marker*) = &Selection::remove; + + m->GoingAway.connect (bind (mem_fun (*this, pmf), m)); + markers.push_back (m); MarkersChanged(); } |