using namespace ARDOUR;
using namespace ArdourSurface;
-OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Stripable> s, lo_address a, uint32_t ss, uint32_t gm, std::bitset<32> fb)
+OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Stripable> s, lo_address a, uint32_t ss, ArdourSurface::OSC::OSCSurface* su)
: _strip (s)
,ssid (ss)
- ,gainmode (gm)
- ,feedback (fb)
+ ,sur (su)
+ ,_last_gain (0.0)
{
addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a));
+ gainmode = sur->gainmode;
+ feedback = sur->feedback;
+ as = ARDOUR::Off;
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());
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (_strip);
if (track) {
- track->monitoring_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_monitor_status, this, track->monitoring_control()), OSC::instance());
- send_monitor_status (track->monitoring_control());
+ track->monitoring_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_monitor_status, this, track->monitoring_control()), OSC::instance());
+ send_monitor_status (track->monitoring_control());
}
boost::shared_ptr<AutomationControl> rec_controllable = _strip->rec_enable_control ();
}
if (feedback[1]) { // level controls
+ boost::shared_ptr<GainControl> gain_cont = _strip->gain_control();
if (gainmode) {
- _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/fader"), _strip->gain_control()), OSC::instance());
- send_gain_message ("/strip/fader", _strip->gain_control());
+ gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::gain_automation, this, X_("/strip/fader")), OSC::instance());
+ gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/fader"), gain_cont), OSC::instance());
+ gain_automation ("/strip/fader");
} else {
- _strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/gain"), _strip->gain_control()), OSC::instance());
- send_gain_message ("/strip/gain", _strip->gain_control());
+ gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::gain_automation, this, X_("/strip/gain")), OSC::instance());
+ gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/gain"), gain_cont), OSC::instance());
+ gain_automation ("/strip/gain");
}
boost::shared_ptr<Controllable> trim_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->trim_control());
{
strip_connections.drop_connections ();
+ if (sur->no_clear) {
+ // some surfaces destroy their own strips and don't need the extra noise
+ lo_address_free (addr);
+ return;
+ }
+
// all strip buttons should be off and faders 0 and etc.
clear_strip ("/strip/expand", 0);
if (feedback[0]) { // buttons are separate feedback
- lo_message msg = lo_message_new ();
- // name is a string do it first
- string path = "/strip/name";
- if (feedback[2]) {
- path = set_path (path);
- } else {
- lo_message_add_int32 (msg, ssid);
- }
- lo_message_add_string (msg, " ");
-
- lo_send_message (addr, path.c_str(), msg);
- lo_message_free (msg);
+ text_with_id ("/strip/name", ssid, " ");
clear_strip ("/strip/mute", 0);
clear_strip ("/strip/solo", 0);
clear_strip ("/strip/recenable", 0);
} else {
now_meter = -193;
}
- if (now_meter < -193) now_meter = -193;
+ if (now_meter < -120) now_meter = -193;
if (_last_meter != now_meter) {
if (feedback[7] || feedback[8]) {
string path = "/strip/meter";
lo_message_add_int32 (msg, ssid);
}
if (gainmode && feedback[7]) {
- uint32_t lev1023 = (uint32_t)((now_meter + 54) * 17.05);
- lo_message_add_int32 (msg, lev1023);
+ lo_message_add_float (msg, ((now_meter + 94) / 100));
lo_send_message (addr, path.c_str(), msg);
} else if ((!gainmode) && feedback[7]) {
lo_message_add_float (msg, now_meter);
_last_meter = now_meter;
}
+ if (feedback[1]) {
+ if (gain_timeout) {
+ if (gain_timeout == 1) {
+ text_with_id ("/strip/name", ssid, _strip->name());
+ }
+ gain_timeout--;
+ }
+ if (trim_timeout) {
+ if (trim_timeout == 1) {
+ text_with_id ("/strip/name", ssid, _strip->name());
+ }
+ trim_timeout--;
+ }
+ }
+ if (feedback[1]) {
+ if (as != ARDOUR::Off) {
+ if(_last_gain != _strip->gain_control()->get_value()) {
+ _last_gain = _strip->gain_control()->get_value();
+ if (gainmode) {
+ send_gain_message ("/strip/fader", _strip->gain_control());
+ } else {
+ send_gain_message ("/strip/fader", _strip->gain_control());
+ }
+ }
+ }
+ }
}
if (!_strip) {
return;
}
+ text_with_id ("/strip/name", ssid, _strip->name());
+}
+void
+OSCRouteObserver::send_change_message (string path, boost::shared_ptr<Controllable> controllable)
+{
lo_message msg = lo_message_new ();
- // ssid is the strip on the surface this observer refers to
- // not part of the internal ordering.
- string path = "/strip/name";
if (feedback[2]) {
path = set_path (path);
} else {
lo_message_add_int32 (msg, ssid);
}
- lo_message_add_string (msg, _strip->name().c_str());
+ float val = controllable->get_value();
+ lo_message_add_float (msg, (float) controllable->internal_to_interface (val));
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
}
void
-OSCRouteObserver::send_change_message (string path, boost::shared_ptr<Controllable> controllable)
+OSCRouteObserver::text_with_id (string path, uint32_t id, string name)
{
lo_message msg = lo_message_new ();
-
if (feedback[2]) {
path = set_path (path);
} else {
- lo_message_add_int32 (msg, ssid);
+ lo_message_add_int32 (msg, id);
}
- lo_message_add_float (msg, (float) controllable->get_value());
+
+ lo_message_add_string (msg, name.c_str());
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
void
OSCRouteObserver::send_trim_message (string path, boost::shared_ptr<Controllable> controllable)
{
+ if (gainmode) {
+ text_with_id ("/strip/name", ssid, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())));
+ trim_timeout = 8;
+ }
+
lo_message msg = lo_message_new ();
if (feedback[2]) {
}
if (gainmode) {
- if (controllable->get_value() == 1) {
- lo_message_add_int32 (msg, 800);
- } else {
- lo_message_add_int32 (msg, gain_to_slider_position (controllable->get_value()) * 1023);
- }
+ lo_message_add_float (msg, gain_to_slider_position (controllable->get_value()));
+ text_with_id ("/strip/name", ssid, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())));
+ gain_timeout = 8;
} else {
if (controllable->get_value() < 1e-15) {
lo_message_add_float (msg, -200);
lo_message_free (msg);
}
+void
+OSCRouteObserver::gain_automation (string path)
+{
+ lo_message msg = lo_message_new ();
+ string apath = string_compose ("%1/automation", path);
+
+ if (feedback[2]) {
+ apath = set_path (apath);
+ } else {
+ lo_message_add_int32 (msg, ssid);
+ }
+
+ boost::shared_ptr<GainControl> control = _strip->gain_control();
+ as = control->alist()->automation_state();
+ lo_message_add_float (msg, as);
+ send_gain_message (path, control);
+ lo_send_message (addr, apath.c_str(), msg);
+ lo_message_free (msg);
+}
+
string
OSCRouteObserver::set_path (string path)
{
if (feedback[2]) {
- ostringstream os;
- os << path << "/" << ssid;
- path = os.str();
+ path = string_compose ("%1/%2", path, ssid);
}
return path;
}
projects / ardour.git / blobdiff