From f64441aa58ce5b17e2665be355b940633fde3c81 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 26 Feb 2017 18:21:48 +0100 Subject: [PATCH] remove method no longer needed Editor::track_selection_changed() is now invoked by EditorRoutes::sync_treeview_from_presentation_info(), AFTER the Selection has been updated --- gtk2_ardour/editor.cc | 10 ---------- gtk2_ardour/editor.h | 2 -- gtk2_ardour/editor_routes.cc | 3 +++ 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 351812aef4..3c41c2f49e 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -828,8 +828,6 @@ Editor::Editor () BasicUI::AccessAction.connect (*this, invalidator (*this), boost::bind (&Editor::access_action, this, _1, _2), gui_context()); - PresentationInfo::Change.connect (*this, invalidator (*this), boost::bind (&Editor::presentation_info_changed, this, _1), gui_context()); - /* handle escape */ ARDOUR_UI::instance()->Escape.connect (*this, invalidator (*this), boost::bind (&Editor::escape, this), gui_context()); @@ -905,14 +903,6 @@ Editor::~Editor() } } -void -Editor::presentation_info_changed (PropertyChange const & what_changed) -{ - if (what_changed.contains (Properties::selected)) { - track_selection_changed (); - } -} - XMLNode* Editor::button_settings () const { diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index d21cc4e1b0..bca0bfae2f 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1839,8 +1839,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void setup_midi_toolbar (); - void presentation_info_changed (PBD::PropertyChange const &); - /* selection process */ Selection* selection; diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc index b1618bde49..2ed98cfad5 100644 --- a/gtk2_ardour/editor_routes.cc +++ b/gtk2_ardour/editor_routes.cc @@ -1198,6 +1198,9 @@ EditorRoutes::sync_treeview_from_presentation_info (PropertyChange const & what_ /* step two: set the Selection (for stripables/routes) */ _editor->get_selection().set (tvl); + + /* step three, tell the editor */ + _editor->track_selection_changed (); } redisplay (); -- 2.30.2