ardour/livetrax
13
0
Fork 0
Code

OSC: Fix math off by one, Check for all stripable controls because VCAs have less (crash fix)

Browse Source
This commit is contained in:
Len Ovens 2016-06-22 14:10:59 -07:00
parent dd549bb09e
commit 844bf70002
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1463,7 +1463,7 @@ uint32_t
OSC::get_rid (uint32_t ssid, lo_address addr)
{
OSCSurface *s = get_surface(addr);
return ssid + s->bank - 2;
return ssid + s->bank - 1;
}
boost::shared_ptr<ARDOUR::Stripable>
@ -1972,7 +1972,7 @@ OSC::strip_gui_select (int ssid, int yn, lo_message msg)
}
int rid = get_rid (ssid, lo_message_get_source (msg));
boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
if (s) {
SetStripableSelection (rid);
} else {
@ -1987,7 +1987,6 @@ OSC::route_set_gain_abs (int ssid, float level, lo_message msg)
{
if (!session) return -1;
boost::shared_ptr<Stripable> s = get_strip (ssid, lo_message_get_source (msg));
//boost::shared_ptr<Stripable> s = session->get_remote_nth_stripable (rid, PresentationInfo::Route);
if (s) {
if (s->gain_control()) {

61
libs/surfaces/osc/osc_select_observer.cc
View File

@ -58,16 +58,20 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address
_strip->solo_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo"), _strip->solo_control()), OSC::instance());
change_message ("/select/solo", _strip->solo_control());
_strip->solo_isolate_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_iso"), _strip->solo_isolate_control()), OSC::instance());
change_message ("/select/solo_iso", _strip->solo_isolate_control());
if (_strip->solo_isolate_control()) {
_strip->solo_isolate_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_iso"), _strip->solo_isolate_control()), OSC::instance());
change_message ("/select/solo_iso", _strip->solo_isolate_control());
}
_strip->solo_safe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_safe"), _strip->solo_safe_control()), OSC::instance());
change_message ("/select/solo_safe", _strip->solo_safe_control());
if (_strip->solo_safe_control()) {
_strip->solo_safe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/solo_safe"), _strip->solo_safe_control()), OSC::instance());
change_message ("/select/solo_safe", _strip->solo_safe_control());
}
boost::shared_ptr<Track> track = boost::dynamic_pointer_cast<Track> (_strip);
if (track) {
track->monitoring_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::monitor_status, this, track->monitoring_control()), OSC::instance());
monitor_status (track->monitoring_control());
track->monitoring_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::monitor_status, this, track->monitoring_control()), OSC::instance());
monitor_status (track->monitoring_control());
}
boost::shared_ptr<AutomationControl> rec_controllable = _strip->rec_enable_control ();
@ -119,8 +123,11 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address
// detecting processor changes requires cast to route
boost::shared_ptr<Route> r = boost::dynamic_pointer_cast<Route>(_strip);
r->processors_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_restart, this, -1), OSC::instance());
send_init();
if (r) {
r->processors_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::send_restart, this, -1), OSC::instance());
send_init();
}
}
tick();
}
@ -340,26 +347,28 @@ OSCSelectObserver::name_changed (const PBD::PropertyChange& what_changed)
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
//spit out the comment at the same time
msg = lo_message_new ();
path = "/select/comment";
boost::shared_ptr<Route> route = boost::dynamic_pointer_cast<Route> (_strip);
lo_message_add_string (msg, route->comment().c_str());
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
if (route) {
//spit out the comment at the same time
msg = lo_message_new ();
path = "/select/comment";
lo_message_add_string (msg, route->comment().c_str());
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
// lets tell the surface how many inputs this strip has
msg = lo_message_new ();
path = "/select/n_inputs";
lo_message_add_int32 (msg, route->n_inputs().n_total());
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
// lets tell the surface how many outputs this strip has
msg = lo_message_new ();
path = "/select/n_outputs";
lo_message_add_int32 (msg, route->n_outputs().n_total());
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
// lets tell the surface how many inputs this strip has
msg = lo_message_new ();
path = "/select/n_inputs";
lo_message_add_int32 (msg, route->n_inputs().n_total());
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
// lets tell the surface how many outputs this strip has
msg = lo_message_new ();
path = "/select/n_outputs";
lo_message_add_int32 (msg, route->n_outputs().n_total());
lo_send_message (addr, path.c_str(), msg);
lo_message_free (msg);
}
}