X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fcontrol_protocol%2Fcontrol_protocol.cc;h=8e866922419f303fec0cafbf2407e46fb77ed23f;hb=48329f8d6ee89480f93747f08603c7aed4d07f36;hp=6ac673925a52d347f7fe1700197e20135cc52dde;hpb=2ea5962af2a389277703c6eebc2160cf52302468;p=ardour.git diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc index 6ac673925a..8e86692241 100644 --- a/libs/surfaces/control_protocol/control_protocol.cc +++ b/libs/surfaces/control_protocol/control_protocol.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser @@ -20,7 +20,9 @@ #include "pbd/error.h" +#include "ardour/gain_control.h" #include "ardour/session.h" +#include "ardour/record_enable_control.h" #include "ardour/route.h" #include "ardour/audio_track.h" #include "ardour/meter.h" @@ -44,15 +46,16 @@ PBD::Signal0 ControlProtocol::VerticalZoomInAll; PBD::Signal0 ControlProtocol::VerticalZoomOutAll; PBD::Signal0 ControlProtocol::VerticalZoomInSelected; PBD::Signal0 ControlProtocol::VerticalZoomOutSelected; -PBD::Signal1 ControlProtocol::TrackSelectionChanged; -PBD::Signal1 ControlProtocol::AddRouteToSelection; -PBD::Signal1 ControlProtocol::SetRouteSelection; -PBD::Signal1 ControlProtocol::ToggleRouteSelection; -PBD::Signal1 ControlProtocol::RemoveRouteFromSelection; -PBD::Signal0 ControlProtocol::ClearRouteSelection; PBD::Signal0 ControlProtocol::StepTracksDown; PBD::Signal0 ControlProtocol::StepTracksUp; +PBD::Signal1 ControlProtocol::StripableSelectionChanged; +PBD::Signal1 ControlProtocol::AddStripableSelection; +PBD::Signal1 ControlProtocol::SetStripableSelection; +PBD::Signal1 ControlProtocol::ToggleStripableSelection; +PBD::Signal0 ControlProtocol::ClearStripableSelection; + + const std::string ControlProtocol::state_node_name ("Protocol"); ControlProtocol::ControlProtocol (Session& s, string str) @@ -76,82 +79,18 @@ ControlProtocol::set_active (bool yn) void ControlProtocol::next_track (uint32_t initial_id) { - uint32_t limit = session->nroutes(); - boost::shared_ptr cr = route_table[0]; - uint32_t id; - - if (cr) { - id = cr->remote_control_id (); - } else { - id = 0; - } - - if (id == limit) { - id = 0; - } else { - id++; - } - - while (id <= limit) { - if ((cr = session->route_by_remote_id (id)) != 0) { - break; - } - id++; - } - - if (id >= limit) { - id = 0; - while (id != initial_id) { - if ((cr = session->route_by_remote_id (id)) != 0) { - break; - } - id++; - } - } - - route_table[0] = cr; + // STRIPABLE route_table[0] = _session->get_nth_stripable (++initial_id, RemoteControlID::Route); } void ControlProtocol::prev_track (uint32_t initial_id) { - uint32_t limit = session->nroutes(); - boost::shared_ptr cr = route_table[0]; - int32_t id; - - if (cr) { - id = cr->remote_control_id (); - } else { - id = 0; - } - - if (id == 0) { - id = limit; - } else { - id--; - } - - while (id >= 0) { - if ((cr = session->route_by_remote_id (id)) != 0) { - break; - } - id--; - } - - if (id < 0) { - uint32_t i = limit; - while (i > initial_id) { - if ((cr = session->route_by_remote_id (i)) != 0) { - break; - } - i--; - } + if (!initial_id) { + return; } - - route_table[0] = cr; + // STRIPABLE route_table[0] = _session->get_nth_stripable (--initial_id, RemoteControlID::Route); } - void ControlProtocol::set_route_table_size (uint32_t size) { @@ -166,7 +105,7 @@ ControlProtocol::set_route_table (uint32_t table_index, boost::shared_ptr= route_table.size()) { return; } - + route_table[table_index] = r; // XXX SHAREDPTR need to handle r->GoingAway @@ -175,6 +114,7 @@ ControlProtocol::set_route_table (uint32_t table_index, boost::shared_ptr r = session->route_by_remote_id (remote_control_id); if (!r) { @@ -182,7 +122,7 @@ ControlProtocol::set_route_table (uint32_t table_index, uint32_t remote_control_ } set_route_table (table_index, r); - +#endif return true; } @@ -198,7 +138,7 @@ ControlProtocol::route_set_rec_enable (uint32_t table_index, bool yn) boost::shared_ptr at = boost::dynamic_pointer_cast(r); if (at) { - at->set_record_enabled (yn, this); + at->rec_enable_control()->set_value (1.0, Controllable::UseGroup); } } @@ -214,7 +154,7 @@ ControlProtocol::route_get_rec_enable (uint32_t table_index) boost::shared_ptr at = boost::dynamic_pointer_cast(r); if (at) { - return at->record_enabled (); + return at->rec_enable_control()->get_value(); } return false; @@ -234,7 +174,7 @@ ControlProtocol::route_get_gain (uint32_t table_index) return 0.0f; } - return r->amp()->gain (); + return r->gain_control()->get_value(); } void @@ -245,9 +185,9 @@ ControlProtocol::route_set_gain (uint32_t table_index, float gain) } boost::shared_ptr r = route_table[table_index]; - + if (r != 0) { - r->set_gain (gain, this); + r->gain_control()->set_value (gain, Controllable::UseGroup); } } @@ -281,10 +221,9 @@ ControlProtocol::route_get_peak_input_power (uint32_t table_index, uint32_t whic return 0.0f; } - return r->peak_meter().meter_level (which_input, MeterPeak); + return r->peak_meter()->meter_level (which_input, MeterPeak); } - bool ControlProtocol::route_get_muted (uint32_t table_index) { @@ -298,7 +237,7 @@ ControlProtocol::route_get_muted (uint32_t table_index) return false; } - return r->muted (); + return r->mute_control()->muted (); } void @@ -311,7 +250,7 @@ ControlProtocol::route_set_muted (uint32_t table_index, bool yn) boost::shared_ptr r = route_table[table_index]; if (r != 0) { - r->set_mute (yn, this); + r->mute_control()->set_value (yn ? 1.0 : 0.0, Controllable::UseGroup); } } @@ -342,7 +281,7 @@ ControlProtocol::route_set_soloed (uint32_t table_index, bool yn) boost::shared_ptr r = route_table[table_index]; if (r != 0) { - r->set_solo (yn, this); + r->solo_control()->set_value (yn ? 1.0 : 0.0, Controllable::UseGroup); } }