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 c0ab97d9a42472795cf33a4afbad85e916e313ef..4ce3ac55b81af67407a42e6807c060bf1fa5b5cf 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -674,6 +674,7 @@ Editor::Editor ()
                _notebook_shrunk = string_is_affirmative (prop->value ());
        }
 
+       editor_summary_pane.set_check_divider_position (true);
        editor_summary_pane.add (edit_packer);
 
        Button* summary_arrows_left_left = manage (new Button);
@@ -718,6 +719,7 @@ Editor::Editor ()
                editor_summary_pane.add (_summary_hbox);
        }
 
+       edit_pane.set_check_divider_position (true);
        edit_pane.add (editor_summary_pane);
        if (!ARDOUR::Profile->get_trx()) {
                edit_pane.add (_the_notebook);
@@ -803,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 */
@@ -1008,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 ()
 {
@@ -1420,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);
@@ -4046,6 +4021,47 @@ Editor::get_grid_beat_divisions(framepos_t position)
        return 0;
 }
 
+/** returns the current musical grid divisiions using the supplied modifier mask from a GtkEvent.
+    if the grid is non-musical, returns 0.
+    if the grid is snapped to bars, returns -1.
+    @param event_state the current keyboard modifier mask.
+*/
+unsigned
+Editor::get_grid_music_divisions (uint32_t event_state)
+{
+       if (snap_mode() == Editing::SnapOff && !ArdourKeyboard::indicates_snap (event_state)) {
+               return 0;
+       }
+
+       if (snap_mode() != Editing::SnapOff && ArdourKeyboard::indicates_snap (event_state)) {
+               return 0;
+       }
+
+       switch (_snap_type) {
+       case SnapToBeatDiv128: return 128;
+       case SnapToBeatDiv64:  return 64;
+       case SnapToBeatDiv32:  return 32;
+       case SnapToBeatDiv28:  return 28;
+       case SnapToBeatDiv24:  return 24;
+       case SnapToBeatDiv20:  return 20;
+       case SnapToBeatDiv16:  return 16;
+       case SnapToBeatDiv14:  return 14;
+       case SnapToBeatDiv12:  return 12;
+       case SnapToBeatDiv10:  return 10;
+       case SnapToBeatDiv8:   return 8;
+       case SnapToBeatDiv7:   return 7;
+       case SnapToBeatDiv6:   return 6;
+       case SnapToBeatDiv5:   return 5;
+       case SnapToBeatDiv4:   return 4;
+       case SnapToBeatDiv3:   return 3;
+       case SnapToBeatDiv2:   return 2;
+       case SnapToBeat:       return 1;
+       case SnapToBar :       return -1;
+       default:               return 0;
+       }
+       return 0;
+}
+
 Evoral::Beats
 Editor::get_grid_type_as_beats (bool& success, framepos_t position)
 {