From f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 17 Dec 2009 18:24:23 +0000 Subject: 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 --- gtk2_ardour/selection.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/selection.h') diff --git a/gtk2_ardour/selection.h b/gtk2_ardour/selection.h index f95b1dbfbe..739d3b4c01 100644 --- a/gtk2_ardour/selection.h +++ b/gtk2_ardour/selection.h @@ -25,6 +25,8 @@ #include +#include "pbd/scoped_connections.h" + #include "time_selection.h" #include "region_selection.h" #include "track_selection.h" @@ -57,7 +59,7 @@ namespace Evoral { /** The Selection class holds lists of selected items (tracks, regions, etc. etc.). */ -class Selection : public sigc::trackable +class Selection : public sigc::trackable, public PBD::ScopedConnectionList { public: enum SelectionType { @@ -86,7 +88,7 @@ class Selection : public sigc::trackable clear(); } - Selection& operator= (const Selection& other); + // Selection& operator= (const Selection& other); sigc::signal RegionsChanged; sigc::signal TracksChanged; @@ -185,9 +187,10 @@ class Selection : public sigc::trackable template void foreach_region (void (ARDOUR::Region::*method)(A), A arg); private: + Selection (const Selection& other) {} PublicEditor const * editor; uint32_t next_time_id; - + void add (std::vector&); }; -- cgit v1.2.3