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/io_selector.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/io_selector.cc')
| -rw-r--r-- | gtk2_ardour/io_selector.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/io_selector.cc b/gtk2_ardour/io_selector.cc index 43052efd11..77f917d92b 100644 --- a/gtk2_ardour/io_selector.cc +++ b/gtk2_ardour/io_selector.cc @@ -170,7 +170,7 @@ IOSelectorWindow::IOSelectorWindow (ARDOUR::Session* session, boost::shared_ptr< show_all (); - signal_delete_event().connect (mem_fun (*this, &IOSelectorWindow::wm_delete)); + signal_delete_event().connect (sigc::mem_fun (*this, &IOSelectorWindow::wm_delete)); } bool @@ -200,7 +200,7 @@ IOSelectorWindow::on_show () void IOSelectorWindow::io_name_changed (void* src) { - ENSURE_GUI_THREAD(bind (mem_fun(*this, &IOSelectorWindow::io_name_changed), src)); + ENSURE_GUI_THREAD (*this, &IOSelectorWindow::io_name_changed, src) string title; @@ -267,12 +267,12 @@ PortInsertWindow::PortInsertWindow (ARDOUR::Session* sess, boost::shared_ptr<ARD get_vbox()->pack_start (_portinsertui); - ok_button.signal_clicked().connect (mem_fun (*this, &PortInsertWindow::accept)); - cancel_button.signal_clicked().connect (mem_fun (*this, &PortInsertWindow::cancel)); + ok_button.signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::accept)); + cancel_button.signal_clicked().connect (sigc::mem_fun (*this, &PortInsertWindow::cancel)); - signal_delete_event().connect (mem_fun (*this, &PortInsertWindow::wm_delete), false); + signal_delete_event().connect (sigc::mem_fun (*this, &PortInsertWindow::wm_delete), false); - going_away_connection = pi->GoingAway.connect (mem_fun (*this, &PortInsertWindow::plugin_going_away)); + going_away_connection = pi->GoingAway.connect (sigc::mem_fun (*this, &PortInsertWindow::plugin_going_away)); } bool @@ -285,7 +285,7 @@ PortInsertWindow::wm_delete (GdkEventAny* /*event*/) void PortInsertWindow::plugin_going_away () { - ENSURE_GUI_THREAD (mem_fun (*this, &PortInsertWindow::plugin_going_away)); + ENSURE_GUI_THREAD (*this, &PortInsertWindow::plugin_going_away) going_away_connection.disconnect (); delete_when_idle (this); |