diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2017-02-21 18:45:16 +0100 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2017-02-21 18:45:29 +0100 |
| commit | 419006dd834827f22be9a73753c2355214b3cdc9 (patch) | |
| tree | 47e696ea24e42d41632cd5508f4e3d254a8accb5 /gtk2_ardour | |
| parent | 81bbeb51eaa4f99c57014efcf1f86a1220689b48 (diff) | |
PBD::Signal<...>::connect() is already thread safe, so drop intermediate proxy/call_slot() invocation in handling Controllable::Changed within AutomationController
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/automation_controller.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/automation_controller.h | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index 7411155551..056e36a778 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -120,7 +120,7 @@ AutomationController::AutomationController(boost::shared_ptr<Automatable> _screen_update_connection = Timers::rapid_connect ( sigc::mem_fun (*this, &AutomationController::display_effective_value)); - ac->Changed.connect (_changed_connection, invalidator (*this), boost::bind (&AutomationController::value_changed, this), gui_context()); + ac->Changed.connect (_changed_connection, invalidator (*this), boost::bind (&AutomationController::display_effective_value, this), gui_context()); add(*_widget); show_all(); @@ -334,12 +334,6 @@ AutomationController::on_button_release(GdkEventButton* ev) return false; } -void -AutomationController::value_changed () -{ - Gtkmm2ext::UI::instance()->call_slot (invalidator (*this), boost::bind (&AutomationController::display_effective_value, this)); -} - /** Stop updating our value from our controllable */ void AutomationController::stop_updating () diff --git a/gtk2_ardour/automation_controller.h b/gtk2_ardour/automation_controller.h index 4d5826023e..126383d517 100644 --- a/gtk2_ardour/automation_controller.h +++ b/gtk2_ardour/automation_controller.h @@ -93,8 +93,6 @@ private: void set_freq_beats(double beats); bool on_button_release(GdkEventButton* ev); - void value_changed(); - Gtk::Widget* _widget; boost::shared_ptr<ARDOUR::Automatable> _printer; boost::shared_ptr<ARDOUR::AutomationControl> _controllable; |