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/port_matrix.h | |
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/port_matrix.h')
-rw-r--r-- | gtk2_ardour/port_matrix.h | 8 |
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; |