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/level_meter.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/level_meter.cc')
| -rw-r--r-- | gtk2_ardour/level_meter.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/level_meter.cc b/gtk2_ardour/level_meter.cc index 392aec20bf..78babf4bb3 100644 --- a/gtk2_ardour/level_meter.cc +++ b/gtk2_ardour/level_meter.cc @@ -60,9 +60,9 @@ LevelMeter::LevelMeter (Session& s) , meter_length (0) { set_spacing (1); - Config->ParameterChanged.connect (mem_fun (*this, &LevelMeter::parameter_changed)); - UI::instance()->theme_changed.connect (mem_fun(*this, &LevelMeter::on_theme_changed)); - ColorsChanged.connect (mem_fun (*this, &LevelMeter::color_handler)); + Config->ParameterChanged.connect (sigc::mem_fun (*this, &LevelMeter::parameter_changed)); + UI::instance()->theme_changed.connect (sigc::mem_fun(*this, &LevelMeter::on_theme_changed)); + ColorsChanged.connect (sigc::mem_fun (*this, &LevelMeter::color_handler)); max_peak = minus_infinity(); } @@ -86,7 +86,7 @@ LevelMeter::set_meter (PeakMeter* meter) _meter = meter; if (_meter) { _configuration_connection = _meter->ConfigurationChanged.connect( - mem_fun(*this, &LevelMeter::configuration_changed)); + sigc::mem_fun(*this, &LevelMeter::configuration_changed)); } } @@ -120,7 +120,7 @@ LevelMeter::update_meters () void LevelMeter::parameter_changed (string p) { - ENSURE_GUI_THREAD (bind (mem_fun(*this, &LevelMeter::parameter_changed), p)); + ENSURE_GUI_THREAD (*this, &LevelMeter::parameter_changed, p) if (p == "meter-hold") { @@ -204,7 +204,7 @@ LevelMeter::setup_meters (int len, int initial_width) meters[n].width = width; meters[n].length = len; meters[n].meter->add_events (Gdk::BUTTON_RELEASE_MASK); - meters[n].meter->signal_button_release_event().connect (bind (mem_fun(*this, &LevelMeter::meter_button_release), n)); + meters[n].meter->signal_button_release_event().connect (sigc::bind (sigc::mem_fun(*this, &LevelMeter::meter_button_release), n)); } pack_end (*meters[n].meter, false, false); |