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/return_ui.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/return_ui.h')
| -rw-r--r-- | gtk2_ardour/return_ui.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gtk2_ardour/return_ui.h b/gtk2_ardour/return_ui.h index 3a5e3c8f3f..ff1f2f35e5 100644 --- a/gtk2_ardour/return_ui.h +++ b/gtk2_ardour/return_ui.h @@ -26,16 +26,15 @@ namespace ARDOUR { class Return; - class Session; class IOProcessor; } class IOSelector; -class ReturnUI : public Gtk::HBox +class ReturnUI : public Gtk::HBox { public: - ReturnUI (Gtk::Window *,boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session&); + ReturnUI (Gtk::Window *,boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session*); ~ReturnUI(); void update (); @@ -47,7 +46,6 @@ class ReturnUI : public Gtk::HBox private: boost::shared_ptr<ARDOUR::Return> _return; - ARDOUR::Session& _session; GainMeter _gpm; Gtk::VBox _vbox; Gtk::VBox _hbox; @@ -61,7 +59,7 @@ class ReturnUI : public Gtk::HBox class ReturnUIWindow : public ArdourDialog { public: - ReturnUIWindow(boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session&); + ReturnUIWindow(boost::shared_ptr<ARDOUR::Return>, ARDOUR::Session*); ~ReturnUIWindow(); ReturnUI* ui; @@ -70,7 +68,7 @@ class ReturnUIWindow : public ArdourDialog Gtk::HBox hpacker; void return_going_away (); - sigc::connection going_away_connection; + boost::signals2::scoped_connection going_away_connection; }; #endif /* __ardour_gtk_return_ui_h__ */ |