diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-03 13:40:34 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-03 13:40:34 +0000 |
| commit | 3104041e67b0f7c476c7478ce4b7a4af3d277da7 (patch) | |
| tree | d9bfaafe7983caca4f3292d5f9835e5bbd0d38b8 /gtk2_ardour/mixer_strip.cc | |
| parent | d166d0584f611d5e1ff85a5008e87c9e21e04952 (diff) | |
meter point restore handling, and related matters
git-svn-id: svn://localhost/ardour2/branches/3.0@6854 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index a0cc11092e..64b388f030 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -412,7 +412,7 @@ MixerStrip::set_route (boost::shared_ptr<Route> rt) _("Click to Add/Edit Comments"): _route->comment()); - _route->meter_change.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::meter_changed, this, _1), gui_context()); + _route->meter_change.connect (route_connections, invalidator (*this), bind (&MixerStrip::meter_changed, this), gui_context()); _route->input()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::input_changed, this, _1, _2), gui_context()); _route->output()->changed.connect (route_connections, invalidator (*this), ui_bind (&MixerStrip::output_changed, this, _1, _2), gui_context()); _route->route_group_changed.connect (route_connections, invalidator (*this), boost::bind (&MixerStrip::route_group_changed, this), gui_context()); @@ -1599,9 +1599,9 @@ MixerStrip::engine_running () /** Called when the metering point has changed */ void -MixerStrip::meter_changed (void *src) +MixerStrip::meter_changed () { - ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed, src) + ENSURE_GUI_THREAD (*this, &MixerStrip::meter_changed) switch (_route->meter_point()) { case MeterInput: |