diff options
Diffstat (limited to 'libs/surfaces/control_protocol')
5 files changed, 30 insertions, 30 deletions
diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc index de50235ee9..0d13c8f264 100644 --- a/libs/surfaces/control_protocol/basic_ui.cc +++ b/libs/surfaces/control_protocol/basic_ui.cc @@ -44,7 +44,7 @@ BasicUI::BasicUI () BasicUI::~BasicUI () { - + } void @@ -148,7 +148,7 @@ BasicUI::transport_play (bool from_last_start) if (session->get_play_range ()) { session->request_play_range (0); } - + if (from_last_start && rolling) { session->request_locate (session->last_transport_start(), true); @@ -186,7 +186,7 @@ void BasicUI::prev_marker () { framepos_t pos = session->locations()->first_mark_before (session->transport_frame()); - + if (pos >= 0) { session->request_locate (pos, session->transport_rolling()); } else { @@ -330,26 +330,26 @@ BasicUI::solo_press (boost::shared_ptr<Route> r, bool momentary, bool global, bo if (momentary) { _solo_release = new SoloMuteRelease (_route->soloed()); } - + if (global) { - + if (_solo_release) { _solo_release->routes = _session->get_routes (); } - + if (Config->get_solo_control_is_listen_control()) { _session->set_listen (_session->get_routes(), !_route->listening(), Session::rt_cleanup, true); } else { _session->set_solo (_session->get_routes(), !_route->soloed(), Session::rt_cleanup, true); } - + } else if (exclusive) { - + if (_solo_release) { _solo_release->exclusive = true; - + boost::shared_ptr<RouteList> routes = _session->get_routes(); - + for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) { if ((*i)->soloed ()) { _solo_release->routes_on->push_back (*i); @@ -358,51 +358,51 @@ BasicUI::solo_press (boost::shared_ptr<Route> r, bool momentary, bool global, bo } } } - + if (Config->get_solo_control_is_listen_control()) { /* ??? we need a just_one_listen() method */ } else { _session->set_just_one_solo (_route, true); } - + } else if (isolate) { - + // shift-click: toggle solo isolated status - + _route->set_solo_isolated (!_route->solo_isolated(), this); delete _solo_release; _solo_release = 0; - + } else if (solo_group) { - + /* Primary-button1: solo mix group. NOTE: Primary-button2 is MIDI learn. */ - + if (_route->route_group()) { - + if (_solo_release) { _solo_release->routes = _route->route_group()->route_list(); } - + if (Config->get_solo_control_is_listen_control()) { _session->set_listen (_route->route_group()->route_list(), !_route->listening(), Session::rt_cleanup, true); } else { _session->set_solo (_route->route_group()->route_list(), !_route->soloed(), Session::rt_cleanup, true); } } - + } else { - + /* click: solo this route */ - + boost::shared_ptr<RouteList> rl (new RouteList); rl->push_back (route()); - + if (_solo_release) { _solo_release->routes = rl; } - + if (Config->get_solo_control_is_listen_control()) { _session->set_listen (rl, !_route->listening()); } else { diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc index b91308c7be..7a218e8532 100644 --- a/libs/surfaces/control_protocol/control_protocol.cc +++ b/libs/surfaces/control_protocol/control_protocol.cc @@ -166,7 +166,7 @@ ControlProtocol::set_route_table (uint32_t table_index, boost::shared_ptr<ARDOUR if (table_index >= route_table.size()) { return; } - + route_table[table_index] = r; // XXX SHAREDPTR need to handle r->GoingAway @@ -245,7 +245,7 @@ ControlProtocol::route_set_gain (uint32_t table_index, float gain) } boost::shared_ptr<Route> r = route_table[table_index]; - + if (r != 0) { r->set_gain (gain, this); } diff --git a/libs/surfaces/control_protocol/control_protocol/basic_ui.h b/libs/surfaces/control_protocol/control_protocol/basic_ui.h index d62a5da5ad..4c8a8ba28f 100644 --- a/libs/surfaces/control_protocol/control_protocol/basic_ui.h +++ b/libs/surfaces/control_protocol/control_protocol/basic_ui.h @@ -41,7 +41,7 @@ class LIBCONTROLCP_API BasicUI { public: BasicUI (ARDOUR::Session&); virtual ~BasicUI (); - + void add_marker (const std::string& = std::string()); void register_thread (std::string name); diff --git a/libs/surfaces/control_protocol/control_protocol/control_protocol.h b/libs/surfaces/control_protocol/control_protocol/control_protocol.h index 3a0eb41509..8edb3f39a7 100644 --- a/libs/surfaces/control_protocol/control_protocol/control_protocol.h +++ b/libs/surfaces/control_protocol/control_protocol/control_protocol.h @@ -88,7 +88,7 @@ class LIBCONTROLCP_API ControlProtocol : public PBD::Stateful, public PBD::Scope respond. Typically this will always be GUI->"others" - the GUI pays no attention to these signals. */ - + static PBD::Signal1<void,RouteNotificationListPtr> TrackSelectionChanged; /* the model here is as follows: @@ -163,7 +163,7 @@ extern "C" { bool (*probe)(ControlProtocolDescriptor*); ControlProtocol* (*initialize)(ControlProtocolDescriptor*,Session*); void (*destroy)(ControlProtocolDescriptor*,ControlProtocol*); - + }; } diff --git a/libs/surfaces/control_protocol/control_protocol/types.h b/libs/surfaces/control_protocol/control_protocol/types.h index 8c05953320..1d46753e51 100644 --- a/libs/surfaces/control_protocol/control_protocol/types.h +++ b/libs/surfaces/control_protocol/control_protocol/types.h @@ -26,7 +26,7 @@ namespace ARDOUR { class Route; - + typedef std::vector<boost::weak_ptr<ARDOUR::Route> > RouteNotificationList; typedef boost::shared_ptr<RouteNotificationList> RouteNotificationListPtr; |