fix behaviour of select_(next|prev)_route() in editor, when VCAs are present.

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 8bca7211fea4d4b3770fadd96985413a90473b8b..c0ab97d9a42472795cf33a4afbad85e916e313ef 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -803,11 +803,9 @@ 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::AddStripableToSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_select, this, _1, Selection::Add), gui_context());
-       ControlProtocol::RemoveStripableFromSelection.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());
+       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::ClearStripableSelection.connect (*this, invalidator (*this), boost::bind (&Editor::control_unselect, this), 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());
 
@@ -1011,7 +1009,7 @@ Editor::control_unselect ()
 }
 
 void
-Editor::control_select (PresentationInfo::order_t global_order, Selection::Operation op)
+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
@@ -1021,22 +1019,7 @@ Editor::control_select (PresentationInfo::order_t global_order, Selection::Opera
                return;
        }
 
-       PresentationInfo::Flag select_flags;
-
-       if (global_order & ~0xffffffff) {
-               /* some flags are set, so the PresentationInfo constructor
-                * will use them
-                */
-               select_flags = PresentationInfo::Flag (0);
-       } else {
-               /* no type flags set in the global order ID, so assume caller
-                * wants to select a Route
-                */
-               select_flags = PresentationInfo::Route;
-       }
-
-       PresentationInfo pi (global_order, select_flags);
-       boost::shared_ptr<Stripable> s = _session->get_remote_nth_stripable (pi.order(), pi.flags());
+       boost::shared_ptr<Stripable> s = _session->get_nth_stripable (order);
 
        /* selected object may not be a Route */
 
@@ -2375,6 +2358,8 @@ Editor::set_state (const XMLNode& node, int version)
 
        if ((prop = node.property ("zoom-focus"))) {
                zoom_focus_selection_done ((ZoomFocus) string_2_enum (prop->value(), zoom_focus));
+       } else {
+               zoom_focus_selection_done (zoom_focus);
        }
 
        if ((prop = node.property ("zoom"))) {
@@ -2392,6 +2377,8 @@ Editor::set_state (const XMLNode& node, int version)
        if ((prop = node.property ("snap-to"))) {
                snap_type_selection_done ((SnapType) string_2_enum (prop->value(), _snap_type));
                set_snap_to ((SnapType) string_2_enum (prop->value(), _snap_type));
+       } else {
+               set_snap_to (_snap_type);
        }
 
        if ((prop = node.property ("snap-mode"))) {
@@ -2401,6 +2388,8 @@ Editor::set_state (const XMLNode& node, int version)
                 * which does not trigger set_text().
                 */
                set_snap_mode ((SnapMode) string_2_enum (prop->value(), _snap_mode));
+       } else {
+               set_snap_mode (_snap_mode);
        }
 
        if ((prop = node.property ("internal-snap-to"))) {
@@ -2453,6 +2442,8 @@ Editor::set_state (const XMLNode& node, int version)
 
        if ((prop = node.property ("edit-point"))) {
                set_edit_point_preference ((EditPoint) string_2_enum (prop->value(), _edit_point), true);
+       } else {
+               set_edit_point_preference (_edit_point);
        }
 
        if ((prop = node.property ("show-measures"))) {