ardour/livetrax
13
0
Fork 0
Code

OSC: personal monitor should only send signal present on change

Browse Source
This commit is contained in:
Len Ovens 2018-10-15 10:38:52 -07:00
parent 5e27b6de2f
commit 8160fd1348
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/surfaces/osc/osc_cue_observer.cc
View File

@ -48,6 +48,8 @@ OSCCueObserver::OSCCueObserver (OSC& o, ArdourSurface::OSC::OSCSurface* su)
_strip = sur->strips[sid];
sends = sur->sends;
_last_signal = -1;
_last_meter = -200;
refresh_strip (_strip, sends, true);
}
@ -118,12 +120,15 @@ OSCCueObserver::tick ()
if (now_meter < -120) now_meter = -193;
if (_last_meter != now_meter) {
float signal;
if (now_meter < -40) {
if (now_meter < -45) {
signal = 0;
} else {
signal = 1;
}
_osc.float_message (X_("/cue/signal"), signal, addr);
if (_last_signal != signal) {
_osc.float_message (X_("/cue/signal"), signal, addr);
_last_signal = signal;
}
}
_last_meter = now_meter;
@ -154,7 +159,7 @@ OSCCueObserver::send_init()
sends[i]->PropertyChanged.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::name_changed, this, boost::lambda::_1, i + 1), OSC::instance());
name_changed (ARDOUR::Properties::name, i + 1);
}
if (send->gain_control()) {
gain_timeout.push_back (0);
@ -162,7 +167,7 @@ OSCCueObserver::send_init()
send->gain_control()->Changed.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::send_gain_message, this, i + 1, send->gain_control(), false), OSC::instance());
send_gain_message (i + 1, send->gain_control(), true);
}
boost::shared_ptr<Processor> proc = boost::dynamic_pointer_cast<Processor> (send);
proc->ActiveChanged.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::send_enabled_message, this, X_("/cue/send/enable"), i + 1, proc), OSC::instance());
send_enabled_message (X_("/cue/send/enable"), i + 1, proc);

1
libs/surfaces/osc/osc_cue_observer.h
View File

@ -56,6 +56,7 @@ class OSCCueObserver
std::string path;
ArdourSurface::OSC::OSCSurface* sur;
float _last_meter;
float _last_signal;
std::vector<uint32_t> gain_timeout;
bool tick_enable;
std::vector<float> _last_gain;