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/automation_controller.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/automation_controller.cc')
| -rw-r--r-- | gtk2_ardour/automation_controller.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 5d601cd829..e25c7e42e1 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -45,16 +45,16 @@ AutomationController::AutomationController(boost::shared_ptr<AutomationControl> set_style (BarController::LeftToRight); set_use_parent (true); - StartGesture.connect (mem_fun(*this, &AutomationController::start_touch)); - StopGesture.connect (mem_fun(*this, &AutomationController::end_touch)); + StartGesture.connect (sigc::mem_fun(*this, &AutomationController::start_touch)); + StopGesture.connect (sigc::mem_fun(*this, &AutomationController::end_touch)); _adjustment->signal_value_changed().connect ( - mem_fun(*this, &AutomationController::value_adjusted)); + sigc::mem_fun(*this, &AutomationController::value_adjusted)); _screen_update_connection = ARDOUR_UI::RapidScreenUpdate.connect ( - mem_fun (*this, &AutomationController::display_effective_value)); + sigc::mem_fun (*this, &AutomationController::display_effective_value)); - ac->Changed.connect (mem_fun(*this, &AutomationController::value_changed)); + ac->Changed.connect (sigc::mem_fun(*this, &AutomationController::value_changed)); } AutomationController::~AutomationController() @@ -130,7 +130,7 @@ AutomationController::end_touch() void AutomationController::automation_state_changed () { - ENSURE_GUI_THREAD(mem_fun(*this, &AutomationController::automation_state_changed)); + ENSURE_GUI_THREAD (*this, &AutomationController::automation_state_changed) bool x = (_controllable->automation_state() != Off); @@ -140,7 +140,7 @@ AutomationController::automation_state_changed () if (x) { _screen_update_connection = ARDOUR_UI::RapidScreenUpdate.connect ( - mem_fun (*this, &AutomationController::display_effective_value)); + sigc::mem_fun (*this, &AutomationController::display_effective_value)); } } @@ -148,6 +148,6 @@ void AutomationController::value_changed () { Gtkmm2ext::UI::instance()->call_slot ( - mem_fun(*this, &AutomationController::display_effective_value)); + sigc::mem_fun(*this, &AutomationController::display_effective_value)); } |