X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fcontrol_protocol%2Fcontrol_protocol.cc;h=f1b2f9f112b97f9cf3a434df2e5d520066a3cf6c;hb=291aec468fe4646aa1e355f2503d349555019e54;hp=e0eb57fc87836038572492fb97ea0554aeecb043;hpb=ae2e8c67657daccb2cdafc3ddfeb7d9df126ed8f;p=ardour.git diff --git a/libs/surfaces/control_protocol/control_protocol.cc b/libs/surfaces/control_protocol/control_protocol.cc index e0eb57fc87..f1b2f9f112 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,13 @@ 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; + +const std::string ControlProtocol::state_node_name ("Protocol"); + ControlProtocol::ControlProtocol (Session& s, string str) : BasicUI (s) , _name (str) @@ -64,85 +64,28 @@ ControlProtocol::~ControlProtocol () { } +int +ControlProtocol::set_active (bool yn) +{ + _active = yn; + return 0; +} + 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) { @@ -157,7 +100,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 @@ -166,6 +109,7 @@ ControlProtocol::set_route_table (uint32_t table_index, boost::shared_ptr r = session->route_by_remote_id (remote_control_id); if (!r) { @@ -173,7 +117,7 @@ ControlProtocol::set_route_table (uint32_t table_index, uint32_t remote_control_ } set_route_table (table_index, r); - +#endif return true; } @@ -189,7 +133,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); } } @@ -205,7 +149,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; @@ -225,7 +169,7 @@ ControlProtocol::route_get_gain (uint32_t table_index) return 0.0f; } - return r->amp()->gain (); + return r->gain_control()->get_value(); } void @@ -236,9 +180,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); } } @@ -272,10 +216,9 @@ ControlProtocol::route_get_peak_input_power (uint32_t table_index, uint32_t whic return 0.0f; } - return r->peak_meter().peak_power (which_input); + return r->peak_meter()->meter_level (which_input, MeterPeak); } - bool ControlProtocol::route_get_muted (uint32_t table_index) { @@ -289,7 +232,7 @@ ControlProtocol::route_get_muted (uint32_t table_index) return false; } - return r->muted (); + return r->mute_control()->muted (); } void @@ -302,7 +245,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); } } @@ -333,7 +276,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); } } @@ -356,5 +299,28 @@ ControlProtocol:: route_get_name (uint32_t table_index) list > ControlProtocol::bundles () { - return list > (); + return list > (); +} + +XMLNode& +ControlProtocol::get_state () +{ + XMLNode* node = new XMLNode (state_node_name); + + node->add_property ("name", _name); + node->add_property ("feedback", get_feedback() ? "yes" : "no"); + + return *node; +} + +int +ControlProtocol::set_state (XMLNode const & node, int /* version */) +{ + const XMLProperty* prop; + + if ((prop = node.property ("feedback")) != 0) { + set_feedback (string_is_affirmative (prop->value())); + } + + return 0; }