diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc index 8ee5f286d1..58cc5bc755 100644 --- a/libs/surfaces/control_protocol/control_protocol.cc +++ b/libs/surfaces/control_protocol/control_protocol.cc @@ -343,31 +343,31 @@ ControlProtocol::first_selected_stripable () const } void -ControlProtocol::AddStripableToSelection (boost::shared_ptr s) +ControlProtocol::add_stripable_to_selection (boost::shared_ptr s) { session->selection().add (s, boost::shared_ptr()); } void -ControlProtocol::SetStripableSelection (boost::shared_ptr s) +ControlProtocol::set_stripable_selection (boost::shared_ptr s) { session->selection().select_stripable_and_maybe_group (s, true, true, 0); } void -ControlProtocol::ToggleStripableSelection (boost::shared_ptr s) +ControlProtocol::toggle_stripable_selection (boost::shared_ptr s) { session->selection().toggle (s, boost::shared_ptr()); } void -ControlProtocol::RemoveStripableFromSelection (boost::shared_ptr s) +ControlProtocol::remove_stripable_from_selection (boost::shared_ptr s) { session->selection().remove (s, boost::shared_ptr()); } void -ControlProtocol::ClearStripableSelection () +ControlProtocol::clear_stripable_selection () { session->selection().clear_stripables (); } diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h index fe69d18e53..8f86235c83 100644 --- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h +++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h @@ -82,11 +82,11 @@ public: static PBD::Signal0 StepTracksDown; static PBD::Signal0 StepTracksUp; - void AddStripableToSelection (boost::shared_ptr); - void SetStripableSelection (boost::shared_ptr); - void ToggleStripableSelection (boost::shared_ptr); - void RemoveStripableFromSelection (boost::shared_ptr); - void ClearStripableSelection (); + void add_stripable_to_selection (boost::shared_ptr); + void set_stripable_selection (boost::shared_ptr); + void toggle_stripable_selection (boost::shared_ptr); + void remove_stripable_from_selection (boost::shared_ptr); + void clear_stripable_selection (); boost::shared_ptr first_selected_stripable () const; diff --git a/libs/surfaces/faderport8/faderport8.cc b/libs/surfaces/faderport8/faderport8.cc index e215fa77bf..b77f3d2b00 100644 --- a/libs/surfaces/faderport8/faderport8.cc +++ b/libs/surfaces/faderport8/faderport8.cc @@ -1710,9 +1710,9 @@ FaderPort8::select_strip (boost::weak_ptr ws) # endif if (shift_mod ()) { - ToggleStripableSelection (s); + toggle_stripable_selection (s); } else { - SetStripableSelection (s); + set_stripable_selection (s); } #else /* tri-state selection: This allows to set the "first selected" @@ -1721,9 +1721,9 @@ FaderPort8::select_strip (boost::weak_ptr ws) */ if (shift_mod ()) { if (s->is_selected ()) { - RemoveStripableFromSelection (s); + remove_stripable_from_selection (s); } else { - SetStripableSelection (s); + set_stripable_selection (s); } return; } @@ -1731,7 +1731,7 @@ FaderPort8::select_strip (boost::weak_ptr ws) set_first_selected_stripable (s); stripable_selection_changed (); } else { - ToggleStripableSelection (s); + toggle_stripable_selection (s); } #endif } @@ -1975,9 +1975,9 @@ FaderPort8::select_prev_next (bool next) if (!selected) { if (strips.size() > 0) { if (next) { - SetStripableSelection (strips.front ()); + set_stripable_selection (strips.front ()); } else { - SetStripableSelection (strips.back ()); + set_stripable_selection (strips.back ()); } } return; @@ -2004,7 +2004,7 @@ FaderPort8::select_prev_next (bool next) } if (found && toselect) { - SetStripableSelection (toselect); + set_stripable_selection (toselect); } } diff --git a/libs/surfaces/launch_control_xl/controllers.cc b/libs/surfaces/launch_control_xl/controllers.cc index 8bdfd62ba5..21c5684a17 100644 --- a/libs/surfaces/launch_control_xl/controllers.cc +++ b/libs/surfaces/launch_control_xl/controllers.cc @@ -898,9 +898,9 @@ LaunchControlXL::button_track_focus(uint8_t n) if (stripable[n]) { if ( stripable[n]->is_selected() ) { - ControlProtocol::RemoveStripableFromSelection (stripable[n]); + ControlProtocol::remove_stripable_from_selection (stripable[n]); } else { - ControlProtocol::AddStripableToSelection (stripable[n]); + ControlProtocol::add_stripable_to_selection (stripable[n]); } } else { return; diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc index d32a2248cb..e2d8911154 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.cc +++ b/libs/surfaces/mackie/mackie_control_protocol.cc @@ -1978,17 +1978,17 @@ MackieControlProtocol::select_range (uint32_t pressed) if (stripables.size() == 1 && ControlProtocol::last_selected().size() == 1 && stripables.front()->is_selected()) { /* cancel selection for one and only selected stripable */ - ToggleStripableSelection (stripables.front()); + toggle_stripable_selection (stripables.front()); } else { for (StripableList::iterator s = stripables.begin(); s != stripables.end(); ++s) { if (main_modifier_state() == MODIFIER_SHIFT) { - ToggleStripableSelection (*s); + toggle_stripable_selection (*s); } else { if (s == stripables.begin()) { - SetStripableSelection (*s); + set_stripable_selection (*s); } else { - AddStripableToSelection (*s); + add_stripable_to_selection (*s); } } } diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 376279e365..849a53db82 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -3591,7 +3591,7 @@ OSC::master_select (lo_message msg) sur->expand_enable = false; boost::shared_ptr s = session->master_out(); if (s) { - SetStripableSelection (s); + set_stripable_selection (s); } return 0; @@ -4839,7 +4839,7 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg) boost::shared_ptr s = get_strip (ssid, get_address (msg)); if (s) { sur->expand_enable = false; - SetStripableSelection (s); + set_stripable_selection (s); } else { if ((int) (sur->feedback.to_ulong())) { 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 (!sur->expand_enable) { - SetStripableSelection (new_sel); + set_stripable_selection (new_sel); } else { sur->expand_strip = new_sel; _strip_select (new_sel, get_address (msg)); diff --git a/libs/surfaces/push2/buttons.cc b/libs/surfaces/push2/buttons.cc index fb9b1f5d9d..0d2173691f 100644 --- a/libs/surfaces/push2/buttons.cc +++ b/libs/surfaces/push2/buttons.cc @@ -746,7 +746,7 @@ Push2::button_master () } if (_current_layout != track_mix_layout) { - ControlProtocol::SetStripableSelection (main_out); + ControlProtocol::set_stripable_selection (main_out); set_current_layout (track_mix_layout); } else { TrackMixLayout* tml = dynamic_cast (_current_layout); @@ -754,7 +754,7 @@ Push2::button_master () /* back to previous layout */ set_current_layout (_previous_layout); } else { - ControlProtocol::SetStripableSelection (main_out); + ControlProtocol::set_stripable_selection (main_out); } } } diff --git a/libs/surfaces/us2400/mcp_buttons.cc b/libs/surfaces/us2400/mcp_buttons.cc index c5331bff24..66802b1d24 100644 --- a/libs/surfaces/us2400/mcp_buttons.cc +++ b/libs/surfaces/us2400/mcp_buttons.cc @@ -772,7 +772,7 @@ LedState US2400Protocol::mstr_press (Button &) { // access_action("Mixer/select-none"); - SetStripableSelection( session->master_out() ); + set_stripable_selection( session->master_out() ); return on; } diff --git a/libs/surfaces/us2400/us2400_control_protocol.cc b/libs/surfaces/us2400/us2400_control_protocol.cc index dcaec531d1..5aa7eb5ccf 100644 --- a/libs/surfaces/us2400/us2400_control_protocol.cc +++ b/libs/surfaces/us2400/us2400_control_protocol.cc @@ -1548,17 +1548,17 @@ US2400Protocol::select_range (uint32_t pressed) if (stripables.size() == 1 && ControlProtocol::last_selected().size() == 1 && stripables.front()->is_selected()) { /* cancel selection for one and only selected stripable */ - ToggleStripableSelection (stripables.front()); + toggle_stripable_selection (stripables.front()); } else { for (StripableList::iterator s = stripables.begin(); s != stripables.end(); ++s) { if (main_modifier_state() == MODIFIER_SHIFT) { - ToggleStripableSelection (*s); + toggle_stripable_selection (*s); } else { if (s == stripables.begin()) { - SetStripableSelection (*s); + set_stripable_selection (*s); } else { - AddStripableToSelection (*s); + add_stripable_to_selection (*s); } } }