allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

OSC: Cue observer simplified.

Browse Source
This commit is contained in:
Len Ovens
2017-10-19 08:46:55 -07:00
parent dabe7474b3
commit 618020424e
3 changed files with 110 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libs/surfaces/osc/osc.cc
View File

@@ -116,10 +116,9 @@ OSC::OSC (Session& s, uint32_t port)
OSC::~OSC()
{
tick = false;
std::cout << "OSC term before stop\n";
stop ();
std::cout << "OSC term after stop\n";
tear_down_gui ();
std::cout << "OSC stopped.\n";
_instance = 0;
}
@@ -307,7 +306,6 @@ OSC::stop ()
surface_destroy (sur);
}
_surface.clear();
std::cout << "sur cleared.\n";
periodic_connection.disconnect ();
session_connections.drop_connections ();
@@ -357,7 +355,7 @@ OSC::surface_destroy (OSCSurface* sur)
sur->sel_obs = 0;
}
if (sur->cue_obs) {
// sur->cue_obs->clear_observer ();
sur->cue_obs->clear_observer ();
delete sur->cue_obs;
sur->cue_obs = 0;
}
@@ -1598,22 +1596,16 @@ OSC::get_surface (lo_address addr)
{
_surface.push_back (s);
}
std::cout << "surface saved, do gui_selection\n";
// moved this down here as selection may need s.<anything to do with select> set
if (!_select || (_select != ControlProtocol::first_selected_stripable())) {
gui_selection_changed();
}
std::cout << "after gui_selection, call strip_feedback\n";
// set bank and strip feedback
strip_feedback (&s);
std::cout << "after strip_feedback, call global_feedback\n";
// Set global/master feedback
global_feedback (&s, addr);
usleep ((uint32_t) 20000);
std::cout << "after global_feedback\n";
return &_surface[_surface.size() - 1];
}
@@ -1634,14 +1626,12 @@ OSC::global_feedback (OSCSurface* sur, lo_address addr)
void
OSC::strip_feedback (OSCSurface* sur)
{
std::cout << "strip_feedback, begin\n";
// delete old observers
for (uint32_t i = 0; i < sur->observers.size(); i++) {
sur->observers[i]->clear_strip ();
delete sur->observers[i];
}
sur->observers.clear();
std::cout << string_compose ("observers delected: size: %1\n", sur->observers.size());
// get freash striplist - just in case
sur->strips = get_sorted_stripables(sur->strip_types, sur->cue);
@@ -1657,7 +1647,6 @@ OSC::strip_feedback (OSCSurface* sur)
sur->observers.push_back (o);
}
}
std::cout << string_compose ("observers created: size: %1\n", sur->observers.size());
}
void
@@ -4976,6 +4965,7 @@ OSC::cue_parse (const char *path, const char* types, lo_arg **argv, int argc, lo
int
OSC::cue_set (uint32_t aux, lo_message msg)
{
set_surface_feedback (0, msg);
return _cue_set (aux, get_address (msg));
}
@@ -5014,9 +5004,13 @@ OSC::_cue_set (uint32_t aux, lo_address addr)
// make a list of stripables with sends that go to this bus
s->sends = cue_get_sorted_stripables(stp, aux, addr);
// start cue observer
OSCCueObserver* co = new OSCCueObserver (stp, s->sends, addr);
s->cue_obs = co;
if (s->cue_obs) {
s->cue_obs->refresh_strip (false);
} else {
// start cue observer
OSCCueObserver* co = new OSCCueObserver (*this, s);
s->cue_obs = co;
}
ret = 0;
}
@@ -5170,7 +5164,7 @@ OSC::float_message_with_id (std::string path, uint32_t ssid, float value, lo_add
{
OSCSurface *sur = get_surface(addr);
lo_message msg = lo_message_new ();
if (sur->feedback[2]) {
if (sur->cue || sur->feedback[2]) {
path = string_compose ("%1/%2", path, ssid);
} else {
lo_message_add_int32 (msg, ssid);
@@ -5187,7 +5181,7 @@ OSC::int_message_with_id (std::string path, uint32_t ssid, int value, lo_address
{
OSCSurface *sur = get_surface(addr);
lo_message msg = lo_message_new ();
if (sur->feedback[2]) {
if (sur->cue || sur->feedback[2]) {
path = string_compose ("%1/%2", path, ssid);
} else {
lo_message_add_int32 (msg, ssid);
@@ -5218,7 +5212,7 @@ OSC::text_message_with_id (std::string path, uint32_t ssid, std::string val, lo_
{
OSCSurface *sur = get_surface(addr);
lo_message msg = lo_message_new ();
if (sur->feedback[2]) {
if (sur->cue || sur->feedback[2]) {
path = string_compose ("%1/%2", path, ssid);
} else {
lo_message_add_int32 (msg, ssid);

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

@@ -35,12 +35,73 @@ using namespace PBD;
using namespace ARDOUR;
using namespace ArdourSurface;
OSCCueObserver::OSCCueObserver (boost::shared_ptr<Stripable> s, std::vector<boost::shared_ptr<ARDOUR::Stripable> >& snds, lo_address a)
: sends (snds)
, _strip (s)
OSCCueObserver::OSCCueObserver (OSC& o, ArdourSurface::OSC::OSCSurface* su)
: _osc (o)
,sur (su)
, tick_enable (false)
{
addr = lo_address_new (lo_address_get_hostname(a) , lo_address_get_port(a));
addr = lo_address_new_from_url (sur->remote_url.c_str());
refresh_strip (true);
}
OSCCueObserver::~OSCCueObserver ()
{
tick_enable = false;
no_strip ();
lo_address_free (addr);
}
void
OSCCueObserver::clear_observer ()
{
tick_enable = false;
strip_connections.drop_connections ();
send_end ();
// all strip buttons should be off and faders 0 and etc.
_osc.text_message_with_id ("/cue/name", 0, " ", addr);
_osc.float_message ("/cue/mute", 0, addr);
_osc.float_message ("/cue/fader", 0, addr);
_osc.float_message ("/cue/signal", 0, addr);
}
void
OSCCueObserver::no_strip ()
{
// This gets called on drop references
tick_enable = false;
strip_connections.drop_connections ();
/*
* The strip will sit idle at this point doing nothing until
* the surface has recalculated it's strip list and then calls
* refresh_strip. Otherwise refresh strip will get a strip address
* that does not exist... Crash
*/
}
void
OSCCueObserver::refresh_strip (bool force)
{
tick_enable = false;
uint32_t sid = sur->aux - 1;
if (sid >= sur->strips.size ()) {
sid = 0;
}
boost::shared_ptr<ARDOUR::Stripable> new_strip = sur->strips[sid];
if (_strip && (new_strip == _strip) && !force) {
tick_enable = true;
return;
}
strip_connections.drop_connections ();
send_end ();
_strip = new_strip;
_strip->DropReferences.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::no_strip, this), OSC::instance());
sends = sur->sends;
_strip->PropertyChanged.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::name_changed, this, boost::lambda::_1, 0), OSC::instance());
name_changed (ARDOUR::Properties::name, 0);
@@ -49,9 +110,9 @@ OSCCueObserver::OSCCueObserver (boost::shared_ptr<Stripable> s, std::vector<boos
send_change_message ("/cue/mute", 0, _strip->mute_control());
gain_timeout.push_back (0);
_last_gain.push_back (0.0);
_strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::send_gain_message, this, 0, _strip->gain_control()), OSC::instance());
send_gain_message (0, _strip->gain_control());
_last_gain.push_back (-1.0);
_strip->gain_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::send_gain_message, this, 0, _strip->gain_control(), false), OSC::instance());
send_gain_message (0, _strip->gain_control(), true);
send_init ();
@@ -59,21 +120,6 @@ OSCCueObserver::OSCCueObserver (boost::shared_ptr<Stripable> s, std::vector<boos
tick ();
}
OSCCueObserver::~OSCCueObserver ()
{
tick_enable = false;
strip_connections.drop_connections ();
send_end ();
// all strip buttons should be off and faders 0 and etc.
text_with_id ("/cue/name", 0, " ");
clear_strip ("/cue/mute", 0);
clear_strip ("/cue/fader", 0);
clear_strip ("/cue/signal", 0);
lo_address_free (addr);
}
void
OSCCueObserver::tick ()
{
@@ -88,17 +134,13 @@ OSCCueObserver::tick ()
}
if (now_meter < -120) now_meter = -193;
if (_last_meter != now_meter) {
string path = "/cue/signal";
lo_message msg = lo_message_new ();
float signal;
if (now_meter < -40) {
signal = 0;
} else {
signal = 1;
}
lo_message_add_float (msg, signal);
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
_osc.float_message ("/cue/signal", signal, addr);
}
_last_meter = now_meter;
@@ -133,9 +175,9 @@ OSCCueObserver::send_init()
if (send->gain_control()) {
gain_timeout.push_back (0);
_last_gain.push_back (0.0);
send->gain_control()->Changed.connect (send_connections, MISSING_INVALIDATOR, boost::bind (&OSCCueObserver::send_gain_message, this, i + 1, send->gain_control()), OSC::instance());
send_gain_message (i + 1, send->gain_control());
_last_gain.push_back (-1.0);
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);
@@ -151,10 +193,12 @@ OSCCueObserver::send_end ()
{
send_connections.drop_connections ();
for (uint32_t i = 1; i <= sends.size(); i++) {
clear_strip (string_compose ("/cue/send/fader/%1", i), 0);
clear_strip (string_compose ("/cue/send/enable/%1", i), 0);
text_with_id ("/cue/send/name", i, " ");
_osc.float_message (string_compose ("/cue/send/fader/%1", i), 0, addr);
_osc.float_message (string_compose ("/cue/send/enable/%1", i), 0, addr);
_osc.text_message_with_id ("/cue/send/name", i, " ", addr);
}
gain_timeout.clear ();
_last_gain.clear ();
}
void
@@ -177,90 +221,48 @@ OSCCueObserver::name_changed (const PBD::PropertyChange& what_changed, uint32_t
return;
}
if (id) {
text_with_id ("/cue/send/name", id, sends[id - 1]->name());
_osc.text_message_with_id ("/cue/send/name", id, sends[id - 1]->name(), addr);
} else {
text_with_id ("/cue/name", 0, _strip->name());
_osc.text_message ("/cue/name", _strip->name(), addr);
}
}
void
OSCCueObserver::send_change_message (string path, uint32_t id, boost::shared_ptr<Controllable> controllable)
{
lo_message msg = lo_message_new ();
// maybe don't need ID only used for mute- maybe mute can use enable
if (id) {
path = string_compose("%1/%2", path, id);
}
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);
_osc.float_message (path, (float) controllable->internal_to_interface (val), addr);
}
void
OSCCueObserver::text_with_id (string path, uint32_t id, string val)
{
lo_message msg = lo_message_new ();
if (id) {
path = string_compose("%1/%2", path, id);
}
lo_message_add_string (msg, val.c_str());
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
}
void
OSCCueObserver::send_gain_message (uint32_t id, boost::shared_ptr<Controllable> controllable)
OSCCueObserver::send_gain_message (uint32_t id, boost::shared_ptr<Controllable> controllable, bool force)
{
if (_last_gain[id] != controllable->get_value()) {
_last_gain[id] = controllable->get_value();
} else {
return;
}
string path = "/cue";
if (id) {
path = "/cue/send";
_osc.text_message_with_id ("/cue/send/name", id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), addr);
_osc.float_message_with_id ("/cue/send/fader", id, controllable->internal_to_interface (controllable->get_value()), addr);
} else {
_osc.text_message ("/cue/name", string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())), addr);
_osc.float_message ("/cue/fader", controllable->internal_to_interface (controllable->get_value()), addr);
}
text_with_id (string_compose ("%1/name", path), id, string_compose ("%1%2%3", std::fixed, std::setprecision(2), accurate_coefficient_to_dB (controllable->get_value())));
path = string_compose ("%1/fader", path);
if (id) {
path = string_compose ("%1/%2", path, id);
}
lo_message msg = lo_message_new ();
lo_message_add_float (msg, controllable->internal_to_interface (controllable->get_value()));
gain_timeout[id] = 8;
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
}
void
OSCCueObserver::send_enabled_message (std::string path, uint32_t id, boost::shared_ptr<ARDOUR::Processor> proc)
{
lo_message msg = lo_message_new ();
if (id) {
path = string_compose("%1/%2", path, id);
_osc.float_message_with_id (path, id, (float) proc->enabled(), addr);
} else {
_osc.float_message (path, (float) proc->enabled(), addr);
}
lo_message_add_float (msg, (float) proc->enabled());
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
}
void
OSCCueObserver::clear_strip (string path, float val)
{
lo_message msg = lo_message_new ();
lo_message_add_float (msg, val);
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
}

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

@@ -33,7 +33,7 @@ class OSCCueObserver
{
public:
OSCCueObserver (boost::shared_ptr<ARDOUR::Stripable>, std::vector<boost::shared_ptr<ARDOUR::Stripable> >& sends, lo_address addr);
OSCCueObserver (ArdourSurface::OSC& o, ArdourSurface::OSC::OSCSurface* sur);
~OSCCueObserver ();
boost::shared_ptr<ARDOUR::Stripable> strip () const { return _strip; }
@@ -41,16 +41,20 @@ class OSCCueObserver
void tick (void);
typedef std::vector<boost::shared_ptr<ARDOUR::Stripable> > Sorted;
Sorted sends;
void clear_observer (void);
void refresh_strip (bool force);
private:
boost::shared_ptr<ARDOUR::Stripable> _strip;
ArdourSurface::OSC& _osc;
PBD::ScopedConnectionList strip_connections;
PBD::ScopedConnectionList send_connections;
lo_address addr;
std::string path;
ArdourSurface::OSC::OSCSurface* sur;
float _last_meter;
std::vector<uint32_t> gain_timeout;
bool tick_enable;
@@ -58,13 +62,12 @@ class OSCCueObserver
void name_changed (const PBD::PropertyChange& what_changed, uint32_t id);
void send_change_message (std::string path, uint32_t id, boost::shared_ptr<PBD::Controllable> controllable);
void text_with_id (std::string path, uint32_t id, std::string val);
void send_gain_message (uint32_t id, boost::shared_ptr<PBD::Controllable> controllable);
void send_gain_message (uint32_t id, boost::shared_ptr<PBD::Controllable> controllable, bool force);
void send_enabled_message (std::string path, uint32_t id, boost::shared_ptr<ARDOUR::Processor> proc);
void clear_strip (std::string path, float val);
void send_init (void);
void send_end (void);
void send_restart (void);
void no_strip ();
};
#endif /* __osc_osccueobserver_h__ */