diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-04 12:45:47 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-04 12:45:53 -0400 |
commit | 906f7e1edd412c35fe16939f3599c76aa0735a89 (patch) | |
tree | 46fc79b59aaeaa84044de96207cb5abd9d4f4e3b /gtk2_ardour | |
parent | 291aec468fe4646aa1e355f2503d349555019e54 (diff) |
GUI doesn't need to listen to old ControlProtocol signals for stripable selection
Diffstat (limited to 'gtk2_ardour')
-rw-r--r-- | gtk2_ardour/editor.cc | 46 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 1 |
2 files changed, 0 insertions, 47 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 3ee542b06a..4ce3ac55b8 100644 --- 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 */ @@ -1011,48 +1007,6 @@ Editor::control_unselect () } 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_remote_nth_stripable (order, PresentationInfo::AllStripables); - - /* 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 () { scroll_tracks_up_line (); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 4fe892504f..ee97886f9c 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1091,7 +1091,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void control_step_tracks_down (); void control_view (uint32_t); void control_scroll (float); - void control_select (ARDOUR::PresentationInfo::order_t which, Selection::Operation); void control_unselect (); void access_action (std::string,std::string); bool deferred_control_scroll (framepos_t); |