diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-11 23:29:48 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-11 23:29:48 +0000 |
| commit | 64dc5427e4f5339a16a018692dd94f476c53cae9 (patch) | |
| tree | 83b76bb578698dbfcde040aa9013a7351190a9b5 /gtk2_ardour/return_ui.cc | |
| parent | d7de23db0f325aaa1dd573739bc9e33925ebdfce (diff) | |
make all use of bind/mem_fun be explicitly sigc::
git-svn-id: svn://localhost/ardour2/branches/3.0@6354 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/return_ui.cc')
| -rw-r--r-- | gtk2_ardour/return_ui.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/return_ui.cc b/gtk2_ardour/return_ui.cc index 32f84add32..c4a4472553 100644 --- a/gtk2_ardour/return_ui.cc +++ b/gtk2_ardour/return_ui.cc @@ -58,13 +58,13 @@ ReturnUI::ReturnUI (Gtk::Window* parent, boost::shared_ptr<Return> r, Session& s show_all (); _return->set_metering (true); - _return->input()->changed.connect (mem_fun (*this, &ReturnUI::ins_changed)); + _return->input()->changed.connect (sigc::mem_fun (*this, &ReturnUI::ins_changed)); _gpm.setup_meters (); _gpm.set_fader_name ("ReturnUIFrame"); - // screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (mem_fun (*this, &ReturnUI::update)); - fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (mem_fun (*this, &ReturnUI::fast_update)); + // screen_update_connection = ARDOUR_UI::instance()->RapidScreenUpdate.connect (sigc::mem_fun (*this, &ReturnUI::update)); + fast_screen_update_connection = ARDOUR_UI::instance()->SuperRapidScreenUpdate.connect (sigc::mem_fun (*this, &ReturnUI::fast_update)); } ReturnUI::~ReturnUI () @@ -80,7 +80,7 @@ ReturnUI::~ReturnUI () void ReturnUI::ins_changed (IOChange change, void* ignored) { - ENSURE_GUI_THREAD(bind (mem_fun (*this, &ReturnUI::ins_changed), change, ignored)); + ENSURE_GUI_THREAD (*this, &ReturnUI::ins_changed, change, ignored) if (change & ConfigurationChanged) { _gpm.setup_meters (); } @@ -111,8 +111,8 @@ ReturnUIWindow::ReturnUIWindow (boost::shared_ptr<Return> s, Session& ss) set_name ("ReturnUIWindow"); - going_away_connection = s->GoingAway.connect (mem_fun (*this, &ReturnUIWindow::return_going_away)); - signal_delete_event().connect (bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window *> (this))); + going_away_connection = s->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))); } ReturnUIWindow::~ReturnUIWindow () @@ -123,7 +123,7 @@ ReturnUIWindow::~ReturnUIWindow () void ReturnUIWindow::return_going_away () { - ENSURE_GUI_THREAD (mem_fun (*this, &ReturnUIWindow::return_going_away)); + ENSURE_GUI_THREAD (*this, &ReturnUIWindow::return_going_away) delete_when_idle (this); going_away_connection.disconnect (); } |