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.cc | |
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.cc')
-rw-r--r-- | gtk2_ardour/return_ui.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc index c4a4472553..8a12a3ece9 100644 --- a/gtk2_ardour/return_ui.cc +++ b/gtk2_ardour/return_ui.cc @@ -34,10 +34,9 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session& se) - : _return (r) - , _session (se) - , _gpm (se, 250) +ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session* session) + :_return (r) + , _gpm (session, 250) { _gpm.set_controls (boost::shared_ptr<Route>(), r->meter(), r->amp()); @@ -49,7 +48,7 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session& s _vbox.pack_start (_hbox, false, false, false); - io = manage (new IOSelector (parent, &se, r->output())); + io = manage (new IOSelector (parent, session, r->output())); pack_start (_vbox, false, false); @@ -99,10 +98,10 @@ ReturnUI::fast_update () } } -ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> s, Session& ss) - : ArdourDialog (string("Ardour: return ") + s->name()) +ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> r, ARDOUR::Session* s) + : ArdourDialog (string("Ardour: return ") + r->name()) { - ui = new ReturnUI (this, s, ss); + ui = new ReturnUI (this, r, s); hpacker.pack_start (*ui, true, true); @@ -111,7 +110,7 @@ ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> s, Session& ss) set_name ("ReturnUIWindow"); - going_away_connection = s->GoingAway.connect (sigc::mem_fun (*this, &ReturnUIWindow::return_going_away)); + going_away_connection = r->GoingAway.connect (sigc::mem_fun (*this, &ReturnUIWindow::return_going_away)); signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this))); } @@ -124,7 +123,7 @@ void ReturnUIWindow::return_going_away () { ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away) + going_away_connection.disconnect (); delete_when_idle (this); - going_away_connection.disconnect (); } |