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

1 files changed, 5 insertions, 3 deletions

diff --git a/gtk2_ardour/port_matrix.h b/gtk2_ardour/port_matrix.h
index cfa4cdbadc..950d5bfd32 100644
--- a/gtk2_ardour/port_matrix.h
+++ b/gtk2_ardour/port_matrix.h
@@ -28,8 +28,11 @@
 #include <gtkmm/checkbutton.h>
 #include <gtkmm/notebook.h>
 #include <boost/shared_ptr.hpp>
+
 #include "ardour/bundle.h"
 #include "ardour/types.h"
+#include "ardour/session_handle.h"
+
 #include "port_group.h"
 #include "port_matrix_types.h"
 #include "i18n.h"
@@ -55,7 +58,7 @@ namespace Gtk {
 
 class PortMatrixBody;
 
-class PortMatrix : public Gtk::Table
+class PortMatrix : public Gtk::Table, public ARDOUR::SessionHandlePtr
 {
 public:
 	PortMatrix (Gtk::Window*, ARDOUR::Session *, ARDOUR::DataType);
@@ -160,7 +163,6 @@ protected:
 	    from left to right as you go from list 0 to list 1.  Hence subclasses which deal with
 	    inputs and outputs should put outputs in list 0 and inputs in list 1. */
 	PortGroupList _ports[2];
-	ARDOUR::Session* _session;
 
 private:
 
@@ -190,7 +192,7 @@ private:
 
 	/// port type that we are working with
 	ARDOUR::DataType _type;
-	std::vector<sigc::connection> _route_connections;
+	PBD::ScopedConnectionList _route_connections;
 
 	PortMatrixBody* _body;
 	Gtk::HScrollbar _hscroll;