#include "boost/lambda/lambda.hpp"
#include "pbd/control_math.h"
+#include <glibmm.h>
+
#include "ardour/session.h"
#include "ardour/track.h"
#include "ardour/monitor_control.h"
#include "ardour/dB.h"
#include "ardour/meter.h"
+#include "ardour/panner.h"
+#include "ardour/panner_shell.h"
+#include "ardour/pannable.h"
+#include "ardour/route.h"
+#include "ardour/route_group.h"
+#include "ardour/send.h"
#include "ardour/solo_isolate_control.h"
#include "osc.h"
,_last_gain (-1.0)
,_last_trim (-1.0)
,_init (true)
+ ,_expand (2048)
{
- addr = lo_address_new_from_url (sur->remote_url.c_str());
- refresh_strip (true);
+ addr = lo_address_new_from_url (sur->remote_url.c_str());
+ gainmode = sur->gainmode;
+ feedback = sur->feedback;
+ in_line = feedback[2];
+ uint32_t sid = sur->bank + ssid - 2;
+ uint32_t not_ready = 0;
+ if (sur->linkset) {
+ not_ready = _osc.link_sets[sur->linkset].not_ready;
+ }
+ if (not_ready) {
+ set_link_ready (not_ready);
+ } else if (sid >= sur->strips.size ()) {
+ // this _should_ only occure if the number of strips is less than banksize
+ _strip = boost::shared_ptr<ARDOUR::Stripable>();
+ clear_strip ();
+ } else {
+ _strip = sur->strips[sid];
+ refresh_strip (_strip, true);
+ }
+ if (sur->expand_enable) {
+ set_expand (sur->expand);
+ } else {
+ set_expand (0);
+ }
+ _send = boost::shared_ptr<ARDOUR::Send> ();
}
OSCRouteObserver::~OSCRouteObserver ()
{
_init = true;
-
strip_connections.drop_connections ();
lo_address_free (addr);
_init = true;
strip_connections.drop_connections ();
+ _gain_control = boost::shared_ptr<ARDOUR::GainControl> ();
+ _send = boost::shared_ptr<ARDOUR::Send> ();
+ _strip = boost::shared_ptr<Stripable> ();
/*
* The strip will sit idle at this point doing nothing until
* the surface has recalculated it's strip list and then calls
}
void
-OSCRouteObserver::refresh_strip (bool force)
+OSCRouteObserver::refresh_strip (boost::shared_ptr<ARDOUR::Stripable> new_strip, bool force)
{
_init = true;
- uint32_t sid = sur->bank + ssid - 2;
- if (sid >= sur->strips.size ()) {
- // this _should_ only occure if the number of strips is less than banksize
- clear_strip ();
- return;
+ if (_tick_busy) {
+ Glib::usleep(100); // let tick finish
}
- // future
- /*if (sur->linkset) {
- //to be added with linkset stuff
- if (_osc.linksets[sur->linkset]->not_ready)
- clear_strip ();
- switch (ssid) {
- case 1:
- _osc.text_message_with_id ("/strip/name", ssid, "Device", addr);
- break;
- case 2:
- _osc.text_message_with_id ("/strip/name", ssid, string_compose ("%1", not_ready), addr);
- break;
- case 3:
- _osc.text_message_with_id ("/strip/name", ssid, "Missing", addr);
- break;
- case 4:
- _osc.text_message_with_id ("/strip/name", ssid, "from", addr);
- break;
- case 5:
- _osc.text_message_with_id ("/strip/name", ssid, "Linkset", addr);
- break;
- default:
- break;
- }
- return;
- }
- }*/
+ _last_gain =-1.0;
+ _last_trim =-1.0;
+ _send = boost::shared_ptr<ARDOUR::Send> ();
- boost::shared_ptr<ARDOUR::Stripable> new_strip = sur->strips[sur->bank + ssid - 2];
- if (_strip && (new_strip == _strip) && !force) {
+ send_select_status (ARDOUR::Properties::selected);
+
+ if ((new_strip == _strip) && !force) {
+ // no change don't send feedback
_init = false;
return;
}
-
+ strip_connections.drop_connections ();
_strip = new_strip;
+ if (!_strip) {
+ // this strip is blank and should be cleared
+ clear_strip ();
+ return;
+ }
_strip->DropReferences.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::no_strip, this), OSC::instance());
as = ARDOUR::Off;
- if (sur->feedback[0]) { // buttons are separate feedback
+ if (feedback[0]) { // buttons are separate feedback
_strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::name_changed, this, boost::lambda::_1), OSC::instance());
name_changed (ARDOUR::Properties::name);
+ boost::shared_ptr<Route> rt = boost::dynamic_pointer_cast<Route> (_strip);
+ if (rt) {
+ rt->route_group_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::group_name, this), OSC::instance());
+ group_name ();
+ }
+
+ _strip->presentation_info().PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::pi_changed, this, _1), OSC::instance());
+ _osc.int_message_with_id (X_("/strip/hide"), ssid, _strip->is_hidden (), in_line, addr);
+
_strip->mute_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/mute"), _strip->mute_control()), OSC::instance());
- send_change_message ("/strip/mute", _strip->mute_control());
+ send_change_message (X_("/strip/mute"), _strip->mute_control());
_strip->solo_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/solo"), _strip->solo_control()), OSC::instance());
- send_change_message ("/strip/solo", _strip->solo_control());
+ send_change_message (X_("/strip/solo"), _strip->solo_control());
if (_strip->solo_isolate_control()) {
_strip->solo_isolate_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/strip/solo_iso"), _strip->solo_isolate_control()), OSC::instance());
- send_change_message ("/strip/solo_iso", _strip->solo_isolate_control());
+ send_change_message (X_("/strip/solo_iso"), _strip->solo_isolate_control());
}
if (_strip->solo_safe_control()) {
_strip->solo_safe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_change_message, this, X_("/strip/solo_safe"), _strip->solo_safe_control()), OSC::instance());
- send_change_message ("/strip/solo_safe", _strip->solo_safe_control());
+ send_change_message (X_("/strip/solo_safe"), _strip->solo_safe_control());
}
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (_strip);
boost::shared_ptr<AutomationControl> rec_controllable = _strip->rec_enable_control ();
if (rec_controllable) {
rec_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/recenable"), _strip->rec_enable_control()), OSC::instance());
- send_change_message ("/strip/recenable", _strip->rec_enable_control());
+ send_change_message (X_("/strip/recenable"), _strip->rec_enable_control());
}
boost::shared_ptr<AutomationControl> recsafe_controllable = _strip->rec_safe_control ();
if (rec_controllable) {
recsafe_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/record_safe"), _strip->rec_safe_control()), OSC::instance());
- send_change_message ("/strip/record_safe", _strip->rec_safe_control());
+ send_change_message (X_("/strip/record_safe"), _strip->rec_safe_control());
}
_strip->presentation_info().PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_select_status, this, _1), OSC::instance());
send_select_status (ARDOUR::Properties::selected);
}
- if (sur->feedback[1]) { // level controls
- boost::shared_ptr<GainControl> gain_cont = _strip->gain_control();
- gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::gain_automation, this), OSC::instance());
- gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_gain_message, this), OSC::instance());
+ if (feedback[1]) { // level controls
+ _gain_control = _strip->gain_control();
+ _gain_control->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::gain_automation, this), OSC::instance());
+ _gain_control->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_gain_message, this), OSC::instance());
gain_automation ();
boost::shared_ptr<Controllable> trim_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->trim_control());
boost::shared_ptr<Controllable> pan_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->pan_azimuth_control());
if (pan_controllable) {
pan_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/pan_stereo_position"), _strip->pan_azimuth_control()), OSC::instance());
- send_change_message ("/strip/pan_stereo_position", _strip->pan_azimuth_control());
+ send_change_message (X_("/strip/pan_stereo_position"), _strip->pan_azimuth_control());
}
}
_init = false;
}
void
-OSCRouteObserver::clear_strip ()
+OSCRouteObserver::refresh_send (boost::shared_ptr<ARDOUR::Send> new_send, bool force)
{
_init = true;
+ if (_tick_busy) {
+ Glib::usleep(100); // let tick finish
+ }
+ _last_gain =-1.0;
+ _last_trim =-1.0;
+ send_select_status (ARDOUR::Properties::selected);
+
+ if ((new_send == _send) && !force) {
+ // no change don't send feedback
+ _init = false;
+ return;
+ }
strip_connections.drop_connections ();
+ if (!_strip) {
+ // this strip is blank and should be cleared
+ clear_strip ();
+ return;
+ }
+ _send = new_send;
+ send_clear ();
+ _strip->DropReferences.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::no_strip, this), OSC::instance());
+ as = ARDOUR::Off;
- // all strip buttons should be off and faders 0 and etc.
- _osc.float_message_with_id ("/strip/expand", ssid, 0, addr);
- if (sur->feedback[0]) { // buttons are separate feedback
- _osc.text_message_with_id ("/strip/name", ssid, " ", addr);
- _osc.float_message_with_id ("/strip/mute", ssid, 0, addr);
- _osc.float_message_with_id ("/strip/solo", ssid, 0, addr);
- _osc.float_message_with_id ("/strip/recenable", ssid, 0, addr);
- _osc.float_message_with_id ("/strip/record_safe", ssid, 0, addr);
- _osc.float_message_with_id ("/strip/monitor_input", ssid, 0, addr);
- _osc.float_message_with_id ("/strip/monitor_disk", ssid, 0, addr);
- _osc.float_message_with_id ("/strip/gui_select", ssid, 0, addr);
- _osc.float_message_with_id ("/strip/select", ssid, 0, addr);
- }
- if (sur->feedback[1]) { // level controls
- if (sur->gainmode) {
- _osc.float_message_with_id ("/strip/fader", ssid, 0, addr);
+ if (feedback[0]) { // buttons are separate feedback
+ _strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::name_changed, this, boost::lambda::_1), OSC::instance());
+ name_changed (ARDOUR::Properties::name);
+ }
+
+ if (feedback[1]) { // level controls
+ _gain_control = _send->gain_control();
+ _gain_control->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::gain_automation, this), OSC::instance());
+ _gain_control->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_gain_message, this), OSC::instance());
+ gain_automation ();
+
+ if (_send->pan_outs() > 1) {
+ boost::shared_ptr<Controllable> pan_controllable = boost::dynamic_pointer_cast<Controllable>(_send->panner_shell()->panner()->pannable()->pan_azimuth_control);
+ if (pan_controllable) {
+ pan_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_change_message, this, X_("/strip/pan_stereo_position"), pan_controllable), OSC::instance());
+ send_change_message (X_("/strip/pan_stereo_position"), pan_controllable);
+ }
} else {
- _osc.float_message_with_id ("/strip/gain", ssid, -193, addr);
+ _osc.float_message_with_id (X_("/strip/pan_stereo_position"), ssid, 0.5, in_line, addr);
}
- _osc.float_message_with_id ("/strip/trimdB", ssid, 0, addr);
- _osc.float_message_with_id ("/strip/pan_stereo_position", ssid, 0.5, addr);
}
- if (sur->feedback[9]) {
- _osc.float_message_with_id ("/strip/signal", ssid, 0, addr);
+ _init = false;
+ tick();
+
+}
+
+void
+OSCRouteObserver::set_expand (uint32_t expand)
+{
+ if (expand != _expand) {
+ _expand = expand;
+ if (expand == ssid) {
+ _osc.float_message_with_id (X_("/strip/expand"), ssid, 1.0, in_line, addr);
+ } else {
+ _osc.float_message_with_id (X_("/strip/expand"), ssid, 0.0, in_line, addr);
+ }
}
- if (sur->feedback[7]) {
- if (sur->gainmode) {
- _osc.float_message_with_id ("/strip/meter", ssid, 0, addr);
+}
+
+void
+OSCRouteObserver::set_link_ready (uint32_t not_ready)
+{
+ if (not_ready) {
+ clear_strip ();
+ switch (ssid) {
+ case 1:
+ _osc.text_message_with_id (X_("/strip/name"), ssid, "Device", in_line, addr);
+ break;
+ case 2:
+ _osc.text_message_with_id (X_("/strip/name"), ssid, string_compose ("%1", not_ready), in_line, addr);
+ break;
+ case 3:
+ _osc.text_message_with_id (X_("/strip/name"), ssid, "Missing", in_line, addr);
+ break;
+ case 4:
+ _osc.text_message_with_id (X_("/strip/name"), ssid, "from", in_line, addr);
+ break;
+ case 5:
+ _osc.text_message_with_id (X_("/strip/name"), ssid, "Linkset", in_line, addr);
+ break;
+ default:
+ break;
+ }
+ } else {
+ refresh_strip (_strip, true);
+ }
+}
+
+void
+OSCRouteObserver::clear_strip ()
+{
+ send_clear ();
+ if (feedback[0]) { // buttons are separate feedback
+ _osc.text_message_with_id (X_("/strip/name"), ssid, " ", in_line, addr);
+ }
+ if (feedback[1]) { // level controls
+ if (gainmode) {
+ _osc.float_message_with_id (X_("/strip/fader"), ssid, 0, in_line, addr);
+ } else {
+ _osc.float_message_with_id (X_("/strip/gain"), ssid, -193, in_line, addr);
+ }
+ _osc.float_message_with_id (X_("/strip/pan_stereo_position"), ssid, 0.5, in_line, addr);
+ }
+}
+
+void
+OSCRouteObserver::send_clear ()
+{
+ _init = true;
+
+ strip_connections.drop_connections ();
+
+ // all strip buttons should be off and faders 0 and etc.
+ _osc.float_message_with_id (X_("/strip/expand"), ssid, 0, in_line, addr);
+ if (feedback[0]) { // buttons are separate feedback
+ _osc.text_message_with_id (X_("/strip/group"), ssid, "none", in_line, addr);
+ _osc.float_message_with_id (X_("/strip/mute"), ssid, 0, in_line, addr);
+ _osc.float_message_with_id (X_("/strip/solo"), ssid, 0, in_line, addr);
+ _osc.float_message_with_id (X_("/strip/recenable"), ssid, 0, in_line, addr);
+ _osc.float_message_with_id (X_("/strip/record_safe"), ssid, 0, in_line, addr);
+ _osc.float_message_with_id (X_("/strip/monitor_input"), ssid, 0, in_line, addr);
+ _osc.float_message_with_id (X_("/strip/monitor_disk"), ssid, 0, in_line, addr);
+ _osc.float_message_with_id (X_("/strip/gui_select"), ssid, 0, in_line, addr);
+ _osc.float_message_with_id (X_("/strip/select"), ssid, 0, in_line, addr);
+ }
+ if (feedback[1]) { // level controls
+ _osc.float_message_with_id (X_("/strip/trimdB"), ssid, 0, in_line, addr);
+ }
+ if (feedback[9]) {
+ _osc.float_message_with_id (X_("/strip/signal"), ssid, 0, in_line, addr);
+ }
+ if (feedback[7]) {
+ if (gainmode) {
+ _osc.float_message_with_id (X_("/strip/meter"), ssid, 0, in_line, addr);
} else {
- _osc.float_message_with_id ("/strip/meter", ssid, -193, addr);
+ _osc.float_message_with_id (X_("/strip/meter"), ssid, -193, in_line, addr);
}
- }else if (sur->feedback[8]) {
- _osc.float_message_with_id ("/strip/meter", ssid, 0, addr);
+ }else if (feedback[8]) {
+ _osc.float_message_with_id (X_("/strip/meter"), ssid, 0, in_line, addr);
}
}
if (_init) {
return;
}
- if (sur->feedback[7] || sur->feedback[8] || sur->feedback[9]) { // meters enabled
+ _tick_busy = true;
+ if (feedback[7] || feedback[8] || feedback[9]) { // meters enabled
// the only meter here is master
+ /* XXXX need to add send meter for send mode or
+ * disable for send mode
+ */
float now_meter;
if (_strip->peak_meter()) {
now_meter = _strip->peak_meter()->meter_level(0, MeterMCP);
}
if (now_meter < -120) now_meter = -193;
if (_last_meter != now_meter) {
- if (sur->feedback[7] || sur->feedback[8]) {
- if (sur->gainmode && sur->feedback[7]) {
- _osc.float_message_with_id ("/strip/meter", ssid, ((now_meter + 94) / 100), addr);
- } else if ((!sur->gainmode) && sur->feedback[7]) {
- _osc.float_message_with_id ("/strip/meter", ssid, now_meter, addr);
- } else if (sur->feedback[8]) {
+ if (feedback[7] || feedback[8]) {
+ if (gainmode && feedback[7]) {
+ _osc.float_message_with_id (X_("/strip/meter"), ssid, ((now_meter + 94) / 100), in_line, addr);
+ } else if ((!gainmode) && feedback[7]) {
+ _osc.float_message_with_id (X_("/strip/meter"), ssid, now_meter, in_line, addr);
+ } else if (feedback[8]) {
uint32_t ledlvl = (uint32_t)(((now_meter + 54) / 3.75)-1);
uint16_t ledbits = ~(0xfff<<ledlvl);
- _osc.int_message_with_id ("/strip/meter", ssid, ledbits, addr);
+ _osc.int_message_with_id (X_("/strip/meter"), ssid, ledbits, in_line, addr);
}
}
- if (sur->feedback[9]) {
+ if (feedback[9]) {
float signal;
if (now_meter < -40) {
signal = 0;
} else {
signal = 1;
}
- _osc.float_message_with_id ("/strip/signal", ssid, signal, addr);
+ _osc.float_message_with_id (X_("/strip/signal"), ssid, signal, in_line, addr);
}
}
_last_meter = now_meter;
}
- if (sur->feedback[1]) {
+ if (feedback[1]) {
if (gain_timeout) {
if (gain_timeout == 1) {
- _osc.text_message_with_id ("/strip/name", ssid, _strip->name(), addr);
+ name_changed (ARDOUR::Properties::name);
}
gain_timeout--;
}
- if (trim_timeout) {
- if (trim_timeout == 1) {
- _osc.text_message_with_id ("/strip/name", ssid, _strip->name(), addr);
- }
- trim_timeout--;
- }
if (as == ARDOUR::Play || as == ARDOUR::Touch) {
- if(_last_gain != _strip->gain_control()->get_value()) {
- _last_gain = _strip->gain_control()->get_value();
+ if(_last_gain != _gain_control->get_value()) {
+ _last_gain = _gain_control->get_value();
send_gain_message ();
}
}
}
-
+ _tick_busy = false;
}
void
if (!what_changed.contains (ARDOUR::Properties::name)) {
return;
}
+ string name = "";
+ if (!_send) {
+ name = _strip->name();
+ } else {
+ name = string_compose ("%1-Send", _strip->name());
+ }
if (_strip) {
- _osc.text_message_with_id ("/strip/name", ssid, _strip->name(), addr);
+ _osc.text_message_with_id (X_("/strip/name"), ssid, name, in_line, addr);
+ }
+}
+
+void
+OSCRouteObserver::group_name ()
+{
+ boost::shared_ptr<Route> rt = boost::dynamic_pointer_cast<Route> (_strip);
+
+ RouteGroup *rg = rt->route_group();
+ if (rg) {
+ _osc.text_message_with_id (X_("/strip/group"), ssid, rg->name(), in_line, addr);
+ } else {
+ _osc.text_message_with_id (X_("/strip/group"), ssid, " ", in_line, addr);
}
}
+void
+OSCRouteObserver::pi_changed (PBD::PropertyChange const& what_changed)
+{
+ if (!what_changed.contains (ARDOUR::Properties::hidden)) {
+ return;
+ }
+ _osc.int_message_with_id (X_("/strip/hide"), ssid, _strip->is_hidden (), in_line, addr);
+}
+
void
OSCRouteObserver::send_change_message (string path, boost::shared_ptr<Controllable> controllable)
{
float val = controllable->get_value();
- _osc.float_message_with_id (path, ssid, (float) controllable->internal_to_interface (val), addr);
+ _osc.float_message_with_id (path, ssid, (float) controllable->internal_to_interface (val), in_line, addr);
}
void
disk = 0;
input = 0;
}
- _osc.int_message_with_id ("/strip/monitor_input", ssid, input, addr);
- _osc.int_message_with_id ("/strip/monitor_disk", ssid, disk, addr);
+ _osc.int_message_with_id (X_("/strip/monitor_input"), ssid, input, in_line, addr);
+ _osc.int_message_with_id (X_("/strip/monitor_disk"), ssid, disk, in_line, addr);
}
} else {
return;
}
- if (sur->gainmode) {
- _osc.text_message_with_id ("/strip/name", ssid, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (_last_trim)), addr);
- trim_timeout = 8;
- }
-
- _osc.float_message_with_id ("/strip/trimdB", ssid, (float) accurate_coefficient_to_dB (_last_trim), addr);
+ _osc.float_message_with_id (X_("/strip/trimdB"), ssid, (float) accurate_coefficient_to_dB (_last_trim), in_line, addr);
}
void
OSCRouteObserver::send_gain_message ()
{
- boost::shared_ptr<Controllable> controllable = _strip->gain_control();
- if (_last_gain != controllable->get_value()) {
- _last_gain = controllable->get_value();
+ if (_last_gain != _gain_control->get_value()) {
+ _last_gain = _gain_control->get_value();
} else {
return;
}
- if (sur->gainmode) {
- _osc.float_message_with_id ("/strip/fader", ssid, controllable->internal_to_interface (_last_gain), addr);
- _osc.text_message_with_id ("/strip/name", ssid, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), addr);
- gain_timeout = 8;
- } else {
- if (controllable->get_value() < 1e-15) {
- _osc.float_message_with_id ("/strip/gain", ssid, -200, addr);
+ if (gainmode) {
+ _osc.float_message_with_id (X_("/strip/fader"), ssid, _gain_control->internal_to_interface (_last_gain), in_line, addr);
+ if (gainmode == 1) {
+ _osc.text_message_with_id (X_("/strip/name"), ssid, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (_last_gain)), in_line, addr);
+ gain_timeout = 8;
+ }
+ }
+ if (!gainmode || gainmode == 2) {
+ if (_last_gain < 1e-15) {
+ _osc.float_message_with_id (X_("/strip/gain"), ssid, -200, in_line, addr);
} else {
- _osc.float_message_with_id ("/strip/gain", ssid, accurate_coefficient_to_dB (_last_gain), addr);
+ _osc.float_message_with_id (X_("/strip/gain"), ssid, accurate_coefficient_to_dB (_last_gain), in_line, addr);
}
}
}
void
OSCRouteObserver::gain_automation ()
{
- string path = "/strip/gain";
- if (sur->gainmode) {
- path = "/strip/fader";
+ string path = X_("/strip/gain");
+ if (gainmode) {
+ path = X_("/strip/fader");
}
send_gain_message ();
- as = _strip->gain_control()->alist()->automation_state();
+ as = _gain_control->alist()->automation_state();
string auto_name;
float output = 0;
switch (as) {
default:
break;
}
- _osc.float_message_with_id (string_compose ("%1/automation", path), ssid, output, addr);
- _osc.text_message_with_id (string_compose ("%1/automation_name", path), ssid, auto_name, addr);
+ _osc.float_message_with_id (string_compose (X_("%1/automation"), path), ssid, output, in_line, addr);
+ _osc.text_message_with_id (string_compose (X_("%1/automation_name"), path), ssid, auto_name, in_line, addr);
}
void
{
if (what == PropertyChange(ARDOUR::Properties::selected)) {
if (_strip) {
- _osc.float_message_with_id ("/strip/select", ssid, _strip->is_selected(), addr);
+ _osc.float_message_with_id (X_("/strip/select"), ssid, _strip->is_selected(), in_line, addr);
}
}
}
projects / ardour.git / blobdiff