allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

redesign API and internals of CoreSelection for more universality

Browse Source 
We now have two basic methods for CoreSelection

* when selecting a stripable, use ::select_stripable_and_maybe_group() with
  appropriate arguments to cover the group selection aspects.

* when selecting an automation control that is part of a stripable, call
  ::select_stripable_with_control()

The old, more simply named methods (set/add/toggle etc.) have all been
made private, and their internal implementations changed somewhat.

This commit includes changes to control surfaces that use CoreSelection directly.
This commit is contained in:
Paul Davis
2024-08-02 11:46:08 -06:00
parent af5c99dd05
commit b21dd1212e
9 changed files with 206 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libs/ctrl-interface/control_protocol/control_protocol.cc
View File

@@ -363,25 +363,25 @@ ControlProtocol::first_selected_stripable () const
void
ControlProtocol::add_stripable_to_selection (std::shared_ptr<ARDOUR::Stripable> s)
{
session->selection().add (s, std::shared_ptr<AutomationControl>());
session->selection().select_stripable_and_maybe_group (s, SelectionAdd);
}
void
ControlProtocol::set_stripable_selection (std::shared_ptr<ARDOUR::Stripable> s)
{
session->selection().select_stripable_and_maybe_group (s, true, true, 0);
session->selection().select_stripable_and_maybe_group (s, SelectionSet);
}
void
ControlProtocol::toggle_stripable_selection (std::shared_ptr<ARDOUR::Stripable> s)
{
session->selection().toggle (s, std::shared_ptr<AutomationControl>());
session->selection().select_stripable_and_maybe_group (s, SelectionToggle);
}
void
ControlProtocol::remove_stripable_from_selection (std::shared_ptr<ARDOUR::Stripable> s)
{
session->selection().remove (s, std::shared_ptr<AutomationControl>());
session->selection().select_stripable_and_maybe_group (s, SelectionRemove);
}
void
@@ -389,7 +389,7 @@ ControlProtocol::add_rid_to_selection (int rid)
{
std::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables);
if (s) {
session->selection().add (s, std::shared_ptr<AutomationControl>());
session->selection().select_stripable_and_maybe_group (s, SelectionAdd);
}
}
@@ -398,7 +398,7 @@ ControlProtocol::set_rid_selection (int rid)
{
std::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables);
if (s) {
session->selection().select_stripable_and_maybe_group (s, true, true, 0);
session->selection().select_stripable_and_maybe_group (s, SelectionSet, true, true, 0);
}
}
@@ -407,7 +407,7 @@ ControlProtocol::toggle_rid_selection (int rid)
{
std::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables);
if (s) {
session->selection().toggle (s, std::shared_ptr<AutomationControl>());
session->selection().select_stripable_and_maybe_group (s, SelectionToggle);
}
}
@@ -416,7 +416,7 @@ ControlProtocol::remove_rid_from_selection (int rid)
{
std::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::MixerStripables);
if (s) {
session->selection().remove (s, std::shared_ptr<AutomationControl>());
session->selection().select_stripable_and_maybe_group (s, SelectionRemove);
}
}