smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-13 10:06:33 +01:00
Code Issues Projects Releases Wiki Activity

NO-OP: rename API rename

Browse source 
CP selection API is now implemented as functions, not signals.
This commit is contained in:
Robin Gareus 2020-10-18 04:04:28 +02:00
parent 84bf97aa49
commit 72736289c8
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
9 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libs/surfaces/control_protocol/control_protocol.cc
View file

@ -343,31 +343,31 @@ ControlProtocol::first_selected_stripable () const
} }
void void
ControlProtocol::AddStripableToSelection (boost::shared_ptr<ARDOUR::Stripable> s) ControlProtocol::add_stripable_to_selection (boost::shared_ptr<ARDOUR::Stripable> s)
{ {
session->selection().add (s, boost::shared_ptr<AutomationControl>()); session->selection().add (s, boost::shared_ptr<AutomationControl>());
} }
void void
ControlProtocol::SetStripableSelection (boost::shared_ptr<ARDOUR::Stripable> s) ControlProtocol::set_stripable_selection (boost::shared_ptr<ARDOUR::Stripable> s)
{ {
session->selection().select_stripable_and_maybe_group (s, true, true, 0); session->selection().select_stripable_and_maybe_group (s, true, true, 0);
} }
void void
ControlProtocol::ToggleStripableSelection (boost::shared_ptr<ARDOUR::Stripable> s) ControlProtocol::toggle_stripable_selection (boost::shared_ptr<ARDOUR::Stripable> s)
{ {
session->selection().toggle (s, boost::shared_ptr<AutomationControl>()); session->selection().toggle (s, boost::shared_ptr<AutomationControl>());
} }
void void
ControlProtocol::RemoveStripableFromSelection (boost::shared_ptr<ARDOUR::Stripable> s) ControlProtocol::remove_stripable_from_selection (boost::shared_ptr<ARDOUR::Stripable> s)
{ {
session->selection().remove (s, boost::shared_ptr<AutomationControl>()); session->selection().remove (s, boost::shared_ptr<AutomationControl>());
} }
void void
ControlProtocol::ClearStripableSelection () ControlProtocol::clear_stripable_selection ()
{ {
session->selection().clear_stripables (); session->selection().clear_stripables ();
} }

10
libs/surfaces/control_protocol/control_protocol/control_protocol.h
View file

@ -82,11 +82,11 @@ public:
static PBD::Signal0<void> StepTracksDown; static PBD::Signal0<void> StepTracksDown;
static PBD::Signal0<void> StepTracksUp; static PBD::Signal0<void> StepTracksUp;
void AddStripableToSelection (boost::shared_ptr<ARDOUR::Stripable>); void add_stripable_to_selection (boost::shared_ptr<ARDOUR::Stripable>);
void SetStripableSelection (boost::shared_ptr<ARDOUR::Stripable>); void set_stripable_selection (boost::shared_ptr<ARDOUR::Stripable>);
void ToggleStripableSelection (boost::shared_ptr<ARDOUR::Stripable>); void toggle_stripable_selection (boost::shared_ptr<ARDOUR::Stripable>);
void RemoveStripableFromSelection (boost::shared_ptr<ARDOUR::Stripable>); void remove_stripable_from_selection (boost::shared_ptr<ARDOUR::Stripable>);
void ClearStripableSelection (); void clear_stripable_selection ();
boost::shared_ptr<ARDOUR::Stripable> first_selected_stripable () const; boost::shared_ptr<ARDOUR::Stripable> first_selected_stripable () const;

16
libs/surfaces/faderport8/faderport8.cc
View file

@ -1710,9 +1710,9 @@ FaderPort8::select_strip (boost::weak_ptr<Stripable> ws)
# endif # endif
if (shift_mod ()) { if (shift_mod ()) {
ToggleStripableSelection (s); toggle_stripable_selection (s);
} else { } else {
SetStripableSelection (s); set_stripable_selection (s);
} }
#else #else
/* tri-state selection: This allows to set the "first selected" /* tri-state selection: This allows to set the "first selected"
@ -1721,9 +1721,9 @@ FaderPort8::select_strip (boost::weak_ptr<Stripable> ws)
*/ */
if (shift_mod ()) { if (shift_mod ()) {
if (s->is_selected ()) { if (s->is_selected ()) {
RemoveStripableFromSelection (s); remove_stripable_from_selection (s);
} else { } else {
SetStripableSelection (s); set_stripable_selection (s);
} }
return; return;
} }
@ -1731,7 +1731,7 @@ FaderPort8::select_strip (boost::weak_ptr<Stripable> ws)
set_first_selected_stripable (s); set_first_selected_stripable (s);
stripable_selection_changed (); stripable_selection_changed ();
} else { } else {
ToggleStripableSelection (s); toggle_stripable_selection (s);
} }
#endif #endif
} }
@ -1975,9 +1975,9 @@ FaderPort8::select_prev_next (bool next)
if (!selected) { if (!selected) {
if (strips.size() > 0) { if (strips.size() > 0) {
if (next) { if (next) {
SetStripableSelection (strips.front ()); set_stripable_selection (strips.front ());
} else { } else {
SetStripableSelection (strips.back ()); set_stripable_selection (strips.back ());
} }
} }
return; return;
@ -2004,7 +2004,7 @@ FaderPort8::select_prev_next (bool next)
} }
if (found && toselect) { if (found && toselect) {
SetStripableSelection (toselect); set_stripable_selection (toselect);
} }
} }

4
libs/surfaces/launch_control_xl/controllers.cc
View file

@ -898,9 +898,9 @@ LaunchControlXL::button_track_focus(uint8_t n)
if (stripable[n]) { if (stripable[n]) {
if ( stripable[n]->is_selected() ) { if ( stripable[n]->is_selected() ) {
ControlProtocol::RemoveStripableFromSelection (stripable[n]); ControlProtocol::remove_stripable_from_selection (stripable[n]);
} else { } else {
ControlProtocol::AddStripableToSelection (stripable[n]); ControlProtocol::add_stripable_to_selection (stripable[n]);
} }
} else { } else {
return; return;

8
libs/surfaces/mackie/mackie_control_protocol.cc
View file

@ -1978,17 +1978,17 @@ MackieControlProtocol::select_range (uint32_t pressed)
if (stripables.size() == 1 && ControlProtocol::last_selected().size() == 1 && stripables.front()->is_selected()) { if (stripables.size() == 1 && ControlProtocol::last_selected().size() == 1 && stripables.front()->is_selected()) {
/* cancel selection for one and only selected stripable */ /* cancel selection for one and only selected stripable */
ToggleStripableSelection (stripables.front()); toggle_stripable_selection (stripables.front());
} else { } else {
for (StripableList::iterator s = stripables.begin(); s != stripables.end(); ++s) { for (StripableList::iterator s = stripables.begin(); s != stripables.end(); ++s) {
if (main_modifier_state() == MODIFIER_SHIFT) { if (main_modifier_state() == MODIFIER_SHIFT) {
ToggleStripableSelection (*s); toggle_stripable_selection (*s);
} else { } else {
if (s == stripables.begin()) { if (s == stripables.begin()) {
SetStripableSelection (*s); set_stripable_selection (*s);
} else { } else {
AddStripableToSelection (*s); add_stripable_to_selection (*s);
} }
} }
} }

6
libs/surfaces/osc/osc.cc
View file

@ -3591,7 +3591,7 @@ OSC::master_select (lo_message msg)
sur->expand_enable = false; sur->expand_enable = false;
boost::shared_ptr<Stripable> s = session->master_out(); boost::shared_ptr<Stripable> s = session->master_out();
if (s) { if (s) {
SetStripableSelection (s); set_stripable_selection (s);
} }
return 0; return 0;
@ -4839,7 +4839,7 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg)
boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg)); boost::shared_ptr<Stripable> s = get_strip (ssid, get_address (msg));
if (s) { if (s) {
sur->expand_enable = false; sur->expand_enable = false;
SetStripableSelection (s); set_stripable_selection (s);
} else { } else {
if ((int) (sur->feedback.to_ulong())) { if ((int) (sur->feedback.to_ulong())) {
float_message_with_id (X_("/strip/select"), ssid, 0, sur->feedback[2], get_address (msg)); float_message_with_id (X_("/strip/select"), ssid, 0, sur->feedback[2], get_address (msg));
@ -4924,7 +4924,7 @@ OSC::sel_delta (int delta, lo_message msg)
} }
if (new_sel) { if (new_sel) {
if (!sur->expand_enable) { if (!sur->expand_enable) {
SetStripableSelection (new_sel); set_stripable_selection (new_sel);
} else { } else {
sur->expand_strip = new_sel; sur->expand_strip = new_sel;
_strip_select (new_sel, get_address (msg)); _strip_select (new_sel, get_address (msg));

4
libs/surfaces/push2/buttons.cc
View file

@ -746,7 +746,7 @@ Push2::button_master ()
} }
if (_current_layout != track_mix_layout) { if (_current_layout != track_mix_layout) {
ControlProtocol::SetStripableSelection (main_out); ControlProtocol::set_stripable_selection (main_out);
set_current_layout (track_mix_layout); set_current_layout (track_mix_layout);
} else { } else {
TrackMixLayout* tml = dynamic_cast<TrackMixLayout*> (_current_layout); TrackMixLayout* tml = dynamic_cast<TrackMixLayout*> (_current_layout);
@ -754,7 +754,7 @@ Push2::button_master ()
/* back to previous layout */ /* back to previous layout */
set_current_layout (_previous_layout); set_current_layout (_previous_layout);
} else { } else {
ControlProtocol::SetStripableSelection (main_out); ControlProtocol::set_stripable_selection (main_out);
} }
} }
} }

2
libs/surfaces/us2400/mcp_buttons.cc
View file

@ -772,7 +772,7 @@ LedState
US2400Protocol::mstr_press (Button &) US2400Protocol::mstr_press (Button &)
{ {
// access_action("Mixer/select-none"); // access_action("Mixer/select-none");
SetStripableSelection( session->master_out() ); set_stripable_selection( session->master_out() );
return on; return on;
} }

8
libs/surfaces/us2400/us2400_control_protocol.cc
View file

@ -1548,17 +1548,17 @@ US2400Protocol::select_range (uint32_t pressed)
if (stripables.size() == 1 && ControlProtocol::last_selected().size() == 1 && stripables.front()->is_selected()) { if (stripables.size() == 1 && ControlProtocol::last_selected().size() == 1 && stripables.front()->is_selected()) {
/* cancel selection for one and only selected stripable */ /* cancel selection for one and only selected stripable */
ToggleStripableSelection (stripables.front()); toggle_stripable_selection (stripables.front());
} else { } else {
for (StripableList::iterator s = stripables.begin(); s != stripables.end(); ++s) { for (StripableList::iterator s = stripables.begin(); s != stripables.end(); ++s) {
if (main_modifier_state() == MODIFIER_SHIFT) { if (main_modifier_state() == MODIFIER_SHIFT) {
ToggleStripableSelection (*s); toggle_stripable_selection (*s);
} else { } else {
if (s == stripables.begin()) { if (s == stripables.begin()) {
SetStripableSelection (*s); set_stripable_selection (*s);
} else { } else {
AddStripableToSelection (*s); add_stripable_to_selection (*s);
} }
} }
} }