ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Prepare removing static selection API 1/2

This commit is contained in:
Robin Gareus 2020-10-18 03:05:33 +02:00
parent d0e1ed403c
commit 818a81aa40
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
gtk2_ardour/editor.cc
View File

@ -814,12 +814,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::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::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());
BasicUI::AccessAction.connect (*this, invalidator (*this), boost::bind (&Editor::access_action, this, _1, _2), gui_context());
/* handle escape */
@ -1026,36 +1020,6 @@ Editor::control_view (uint32_t view)
goto_visual_state (view);
}
void
Editor::control_unselect ()
{
selection->clear_tracks ();
}
void
Editor::control_select (boost::shared_ptr<Stripable> s, Selection::Operation op)
{
TimeAxisView* tav = time_axis_view_from_stripable (s);
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 ()
{

2
gtk2_ardour/editor.h
View File

@ -1117,8 +1117,6 @@ private:
void control_step_tracks_down ();
void control_view (uint32_t);
void control_scroll (float);
void control_select (boost::shared_ptr<ARDOUR::Stripable>, Selection::Operation);
void control_unselect ();
void access_action (const std::string&, const std::string&);
void set_toggleaction (const std::string&, const std::string&, bool);
bool deferred_control_scroll (samplepos_t);

6
gtk2_ardour/editor_mixer.cc
View File

@ -224,12 +224,6 @@ Editor::set_selected_mixer_strip (TimeAxisView& view)
}
}
/* Typically this is set by changing the TAV selection but if for any
* reason we decide to show a different strip for some reason, make
* sure that control surfaces can find it.
*/
ARDOUR::ControlProtocol::set_first_selected_stripable (stripable);
Glib::RefPtr<Gtk::Action> act = ActionManager::get_action (X_("Editor"), X_("show-editor-mixer"));
if (act) {