diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-19 20:26:31 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-19 20:26:31 +0000 |
| commit | aae367b63c9b619db1e40f27dc334c6987219481 (patch) | |
| tree | 142f6ffed6bb749e24a06343587cad6b966888bd /gtk2_ardour/plugin_ui.cc | |
| parent | 67460c2af45d0455e64623572480c064445c2e5b (diff) | |
use new syntax for connecting to backend signals that enforces explicit connection scope, plus a few other related matters
git-svn-id: svn://localhost/ardour2/branches/3.0@6376 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/plugin_ui.cc')
| -rw-r--r-- | gtk2_ardour/plugin_ui.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk2_ardour/plugin_ui.cc b/gtk2_ardour/plugin_ui.cc index dd2b0b204d..24106c4351 100644 --- a/gtk2_ardour/plugin_ui.cc +++ b/gtk2_ardour/plugin_ui.cc @@ -142,7 +142,7 @@ PluginUIWindow::PluginUIWindow (Gtk::Window* win, boost::shared_ptr<PluginInsert add_events (Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK); signal_delete_event().connect (sigc::bind (sigc::ptr_fun (just_hide_it), reinterpret_cast<Window*> (this)), false); - death_connection = insert->GoingAway.connect (sigc::mem_fun(*this, &PluginUIWindow::plugin_going_away)); + insert->GoingAway.connect (death_connection, boost::bind (&PluginUIWindow::plugin_going_away, this)); gint h = _pluginui->get_preferred_height (); gint w = _pluginui->get_preferred_width (); @@ -390,9 +390,7 @@ PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi) save_button.set_name ("PluginSaveButton"); save_button.signal_clicked().connect(sigc::mem_fun(*this, &PlugUIBase::save_plugin_setting)); - insert->ActiveChanged.connect (sigc::bind( - sigc::mem_fun(*this, &PlugUIBase::processor_active_changed), - boost::weak_ptr<Processor>(insert))); + insert->ActiveChanged.connect (active_connection, boost::bind (&PlugUIBase::processor_active_changed, this, boost::weak_ptr<Processor>(insert))); bypass_button.set_active (!pi->active()); @@ -416,7 +414,7 @@ PlugUIBase::PlugUIBase (boost::shared_ptr<PluginInsert> pi) plugin_analysis_expander.property_expanded().signal_changed().connect( sigc::mem_fun(*this, &PlugUIBase::toggle_plugin_analysis)); plugin_analysis_expander.set_expanded(false); - death_connection = insert->GoingAway.connect (sigc::mem_fun (*this, &PlugUIBase::plugin_going_away)); + insert->GoingAway.connect (death_connection, boost::bind (&PlugUIBase::plugin_going_away, this)); } PlugUIBase::~PlugUIBase() |