GUI doesn't need to listen to old ControlProtocol signals for stripable selection

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 605a7857358407d0a2b999b3d873136658190b46..4ce3ac55b81af67407a42e6807c060bf1fa5b5cf 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -805,10 +805,6 @@ Editor::Editor ()
        ControlProtocol::VerticalZoomInSelected.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_in_selected, this), gui_context());
        ControlProtocol::VerticalZoomOutSelected.connect (*this, invalidator (*this), boost::bind (&Editor::control_vertical_zoom_out_selected, this), gui_context());
 
-       ControlProtocol::AddStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Add), gui_context());
-       ControlProtocol::ToggleStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Toggle), gui_context());
-       ControlProtocol::SetStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Set), gui_context());
-
        BasicUI::AccessAction.connect (*this, invalidator (*this), boost::bind (&Editor::access_action, this, _1, _2), gui_context());
 
        /* handle escape */
@@ -1010,48 +1006,6 @@ Editor::control_unselect ()
        selection->clear_tracks ();
 }
 
-void
-Editor::control_select (PresentationInfo::order_t order, Selection::Operation op)
-{
-       /* handles the (static) signal from the ControlProtocol class that
-        * requests setting the selected track to a given RID
-        */
-
-       if (!_session) {
-               return;
-       }
-
-       boost::shared_ptr<Stripable> s = _session->get_nth_stripable (order);
-
-       /* selected object may not be a Route */
-
-       boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route> (s);
-
-       if (!r) {
-               return;
-       }
-
-       TimeAxisView* tav = axis_view_from_route (r);
-
-       if (tav) {
-               switch (op) {
-               case Selection::Add:
-                       selection->add (tav);
-                       break;
-               case Selection::Toggle:
-                       selection->toggle (tav);
-                       break;
-               case Selection::Extend:
-                       break;
-               case Selection::Set:
-                       selection->set (tav);
-                       break;
-               }
-       } else {
-               selection->clear_tracks ();
-       }
-}
-
 void
 Editor::control_step_tracks_up ()
 {
@@ -1422,6 +1376,25 @@ Editor::set_session (Session *t)
                break;
        }
 
+       /* catch up on selection of stripables (other selection state is lost
+        * when a session is closed
+        */
+
+       StripableList sl;
+       TrackViewList tl;
+       _session->get_stripables (sl);
+       for (StripableList::const_iterator s = sl.begin(); s != sl.end(); ++s) {
+               if ((*s)->presentation_info().selected()) {
+                       RouteTimeAxisView* rtav = get_route_view_by_route_id ((*s)->id());
+                       if (rtav) {
+                               tl.push_back (rtav);
+                       }
+               }
+       }
+       if (!tl.empty()) {
+               selection->set (tl);
+       }
+
        /* register for undo history */
        _session->register_with_memento_command_factory(id(), this);
        _session->register_with_memento_command_factory(_selection_memento->id(), _selection_memento);