1 files changed, 76 insertions, 243 deletions

diff --git a/libs/surfaces/osc/osc_route_observer.cc b/libs/surfaces/osc/osc_route_observer.cc
index 03e2578022..a960cf0003 100644
--- a/libs/surfaces/osc/osc_route_observer.cc
+++ b/libs/surfaces/osc/osc_route_observer.cc
@@ -38,8 +38,8 @@ using namespace PBD;
 using namespace ARDOUR;
 using namespace ArdourSurface;
 
-OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Stripable> s, uint32_t ss, ArdourSurface::OSC::OSCSurface* su)
-	: _strip (s)
+OSCRouteObserver::OSCRouteObserver (OSC& o, uint32_t ss, ArdourSurface::OSC::OSCSurface* su)
+	: _osc (o)
 	,ssid (ss)
 	,sur (su)
 	,_last_gain (-1.0)
@@ -47,11 +47,27 @@ OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Stripable> s, uint32_t ss,
 	,_init (true)
 {
 	addr = lo_address_new_from_url 	(sur->remote_url.c_str());
-	gainmode = sur->gainmode;
-	feedback = sur->feedback;
+	refresh_strip (true);
+}
+
+OSCRouteObserver::~OSCRouteObserver ()
+{
+	_init = true;
+
+	strip_connections.drop_connections ();
+
+	lo_address_free (addr);
+}
+
+void
+OSCRouteObserver::refresh_strip (bool force)
+{
+	_init = true;
+
+	_strip = sur->strips[sur->bank + ssid - 2];
 	as = ARDOUR::Off;
 
-	if (feedback[0]) { // buttons are separate feedback
+	if (sur->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);
 
@@ -91,22 +107,16 @@ OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Stripable> s, uint32_t ss,
 		send_select_status (ARDOUR::Properties::selected);
 	}
 
-	if (feedback[1]) { // level controls
+	if (sur->feedback[1]) { // level controls
 		boost::shared_ptr<GainControl> gain_cont = _strip->gain_control();
-		if (gainmode) {
-			gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::gain_automation, this, X_("/strip/fader")), OSC::instance());
-			gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/fader"), gain_cont), OSC::instance());
-			gain_automation ("/strip/fader");
-		} else {
-			gain_cont->alist()->automation_state_changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::gain_automation, this, X_("/strip/gain")), OSC::instance());
-			gain_cont->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_gain_message, this, X_("/strip/gain"), gain_cont), OSC::instance());
-			gain_automation ("/strip/gain");
-		}
+		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());
+		gain_automation ();
 
 		boost::shared_ptr<Controllable> trim_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->trim_control());
 		if (trim_controllable) {
-			trim_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_trim_message, this, X_("/strip/trimdB"), _strip->trim_control()), OSC::instance());
-			send_trim_message ("/strip/trimdB", _strip->trim_control());
+			trim_controllable->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCRouteObserver::send_trim_message, this), OSC::instance());
+			send_trim_message ();
 		}
 
 		boost::shared_ptr<Controllable> pan_controllable = boost::dynamic_pointer_cast<Controllable>(_strip->pan_azimuth_control());
@@ -117,55 +127,7 @@ OSCRouteObserver::OSCRouteObserver (boost::shared_ptr<Stripable> s, uint32_t ss,
 	}
 	_init = false;
 	tick();
-}
-
-OSCRouteObserver::~OSCRouteObserver ()
-{
-	_init = true;
-
-	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
-		text_with_id ("/strip/name", ssid, " ");
-		clear_strip ("/strip/mute", 0);
-		clear_strip ("/strip/solo", 0);
-		clear_strip ("/strip/recenable", 0);
-		clear_strip ("/strip/record_safe", 0);
-		clear_strip ("/strip/monitor_input", 0);
-		clear_strip ("/strip/monitor_disk", 0);
-		clear_strip ("/strip/gui_select", 0);
-		clear_strip ("/strip/select", 0);
-	}
-	if (feedback[1]) { // level controls
-		if (gainmode) {
-			clear_strip ("/strip/fader", 0);
-		} else {
-			clear_strip ("/strip/gain", -193);
-		}
-		clear_strip ("/strip/trimdB", 0);
-		clear_strip ("/strip/pan_stereo_position", 0.5);
-	}
-	if (feedback[9]) {
-		clear_strip ("/strip/signal", 0);
-	}
-	if (feedback[7]) {
-		if (gainmode) {
-			clear_strip ("/strip/meter", 0);
-		} else {
-			clear_strip ("/strip/meter", -193);
-		}
-	}else if (feedback[8]) {
-		clear_strip ("/strip/meter", 0);
-	}
 
-	lo_address_free (addr);
 }
 
 void
@@ -174,7 +136,7 @@ OSCRouteObserver::tick ()
 	if (_init) {
 		return;
 	}
-	if (feedback[7] || feedback[8] || feedback[9]) { // meters enabled
+	if (sur->feedback[7] || sur->feedback[8] || sur->feedback[9]) { // meters enabled
 		// the only meter here is master
 		float now_meter;
 		if (_strip->peak_meter()) {
@@ -184,72 +146,47 @@ OSCRouteObserver::tick ()
 		}
 		if (now_meter < -120) now_meter = -193;
 		if (_last_meter != now_meter) {
-			if (feedback[7] || feedback[8]) {
-				string path = "/strip/meter";
-				lo_message msg = lo_message_new ();
-				if (feedback[2]) {
-					path = set_path (path);
-				} else {
-					lo_message_add_int32 (msg, ssid);
-				}
-				if (gainmode && feedback[7]) {
-					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);
-					lo_send_message (addr, path.c_str(), msg);
-				} else if (feedback[8]) {
+			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]) {
 					uint32_t ledlvl = (uint32_t)(((now_meter + 54) / 3.75)-1);
 					uint16_t ledbits = ~(0xfff<<ledlvl);
-					lo_message_add_int32 (msg, ledbits);
-					lo_send_message (addr, path.c_str(), msg);
+					_osc.int_message_with_id ("/strip/meter", ssid, ledbits, addr);
 				}
-				lo_message_free (msg);
 			}
-			if (feedback[9]) {
-				string path = "/strip/signal";
-				lo_message msg = lo_message_new ();
-				if (feedback[2]) {
-					path = set_path (path);
-				} else {
-					lo_message_add_int32 (msg, ssid);
-				}
+			if (sur->feedback[9]) {
 				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_with_id ("/strip/signal", ssid, signal, addr);
 			}
 		}
 		_last_meter = now_meter;
 
 	}
-	if (feedback[1]) {
+	if (sur->feedback[1]) {
 		if (gain_timeout) {
 			if (gain_timeout == 1) {
-				text_with_id ("/strip/name", ssid, _strip->name());
+				_osc.text_message_with_id ("/strip/name", ssid, _strip->name(), addr);
 			}
 			gain_timeout--;
 		}
 		if (trim_timeout) {
 			if (trim_timeout == 1) {
-				text_with_id ("/strip/name", ssid, _strip->name());
+				_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 (gainmode) {
-					send_gain_message ("/strip/fader", _strip->gain_control());
-					gain_timeout = 8;
-				} else {
-					send_gain_message ("/strip/gain", _strip->gain_control());
-				}
+				send_gain_message ();
 			}
 		}
 	}
@@ -263,43 +200,16 @@ OSCRouteObserver::name_changed (const PBD::PropertyChange& what_changed)
 	    return;
 	}
 
-	if (!_strip) {
-		return;
+	if (_strip) {
+		_osc.text_message_with_id ("/strip/name", ssid, _strip->name(), addr);
 	}
-	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 ();
-
-	if (feedback[2]) {
-		path = set_path (path);
-	} else {
-		lo_message_add_int32 (msg, ssid);
-	}
 	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::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, id);
-	}
-
-	lo_message_add_string (msg, name.c_str());
-
-	lo_send_message (addr, path.c_str(), msg);
-	lo_message_free (msg);
+	_osc.float_message_with_id (path, ssid, (float) controllable->internal_to_interface (val), addr);
 }
 
 void
@@ -316,110 +226,67 @@ OSCRouteObserver::send_monitor_status (boost::shared_ptr<Controllable> controlla
 			disk = 1;
 			input = 0;
 			break;
+		case 3:
+			disk = 1;
+			input = 1;
+			break;
 		default:
 			disk = 0;
 			input = 0;
 	}
-
-	lo_message msg = lo_message_new ();
-	string path = "/strip/monitor_input";
-	if (feedback[2]) {
-		path = set_path (path);
-	} else {
-		lo_message_add_int32 (msg, ssid);
-	}
-	lo_message_add_int32 (msg, (float) input);
-	lo_send_message (addr, path.c_str(), msg);
-	lo_message_free (msg);
-
-	msg = lo_message_new ();
-	path = "/strip/monitor_disk";
-	if (feedback[2]) {
-		path = set_path (path);
-	} else {
-		lo_message_add_int32 (msg, ssid);
-	}
-	lo_message_add_int32 (msg, (float) disk);
-	lo_send_message (addr, path.c_str(), msg);
-	lo_message_free (msg);
+	_osc.int_message_with_id ("/strip/monitor_input", ssid, input, addr);
+	_osc.int_message_with_id ("/strip/monitor_disk", ssid, disk, addr);
 
 }
 
 void
-OSCRouteObserver::send_trim_message (string path, boost::shared_ptr<Controllable> controllable)
+OSCRouteObserver::send_trim_message ()
 {
-	if (_last_trim != controllable->get_value()) {
-		_last_trim = controllable->get_value();
+	if (_last_trim != _strip->trim_control()->get_value()) {
+		_last_trim = _strip->trim_control()->get_value();
 	} else {
 		return;
 	}
-	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())));
+	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;
 	}
 
-	lo_message msg = lo_message_new ();
-
-	if (feedback[2]) {
-		path = set_path (path);
-	} else {
-		lo_message_add_int32 (msg, ssid);
-	}
-
-	lo_message_add_float (msg, (float) accurate_coefficient_to_dB (controllable->get_value()));
-
-	lo_send_message (addr, path.c_str(), msg);
-	lo_message_free (msg);
+	_osc.float_message_with_id ("/strip/trimdB", ssid, (float) accurate_coefficient_to_dB (_last_trim), addr);
 }
 
 void
-OSCRouteObserver::send_gain_message (string path, boost::shared_ptr<Controllable> controllable)
+OSCRouteObserver::send_gain_message ()
 {
+	boost::shared_ptr<Controllable> controllable = _strip->gain_control();
 	if (_last_gain != controllable->get_value()) {
 		_last_gain = controllable->get_value();
 	} else {
 		return;
 	}
-	lo_message msg = lo_message_new ();
 
-	if (feedback[2]) {
-		path = set_path (path);
-	} else {
-		lo_message_add_int32 (msg, ssid);
-	}
-
-	if (gainmode) {
-		lo_message_add_float (msg, controllable->internal_to_interface (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())));
+	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) {
-			lo_message_add_float (msg, -200);
+			_osc.float_message_with_id ("/strip/gain", ssid, -200, addr);
 		} else {
-			lo_message_add_float (msg, accurate_coefficient_to_dB (controllable->get_value()));
+			_osc.float_message_with_id ("/strip/gain", ssid, accurate_coefficient_to_dB (_last_gain), addr);
 		}
 	}
-
-	lo_send_message (addr, path.c_str(), msg);
-	lo_message_free (msg);
 }
 
 void
-OSCRouteObserver::gain_automation (string path)
+OSCRouteObserver::gain_automation ()
 {
-	lo_message msg = lo_message_new ();
-	string apath = string_compose ("%1/automation", path);
-	string npath = string_compose ("%1/automation_name", path);
-
-	if (feedback[2]) {
-		apath = set_path (apath);
-	} else {
-		lo_message_add_int32 (msg, ssid);
+	string path = "/strip/gain";
+	if (sur->gainmode) {
+		path = "/strip/fader";
 	}
-
-	boost::shared_ptr<GainControl> control = _strip->gain_control();
-	send_gain_message (path, control);
-	as = control->alist()->automation_state();
+	send_gain_message ();
+	as = _strip->gain_control()->alist()->automation_state();
 	string auto_name;
 	float output = 0;
 	switch (as) {
@@ -439,39 +306,15 @@ OSCRouteObserver::gain_automation (string path)
 			output = 3;
 			auto_name = "Touch";
 			break;
+		case ARDOUR::Latch:
+			output = 4;
+			auto_name = "Latch";
+			break;
 		default:
 			break;
 	}
-
-	lo_message_add_float (msg, output);
-	lo_send_message (addr, apath.c_str(), msg);
-	lo_message_free (msg);
-	text_with_id (npath, ssid, auto_name);
-}
-
-string
-OSCRouteObserver::set_path (string path)
-{
-	if (feedback[2]) {
-		path = string_compose ("%1/%2", path, ssid);
-	}
-	return path;
-}
-
-void
-OSCRouteObserver::clear_strip (string path, float val)
-{
-	lo_message msg = lo_message_new ();
-	if (feedback[2]) {
-		path = set_path (path);
-	} else {
-		lo_message_add_int32 (msg, ssid);
-	}
-	lo_message_add_float (msg, val);
-
-	lo_send_message (addr, path.c_str(), msg);
-	lo_message_free (msg);
-
+	_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);
 }
 
 void
@@ -479,17 +322,7 @@ OSCRouteObserver::send_select_status (const PropertyChange& what)
 {
 	if (what == PropertyChange(ARDOUR::Properties::selected)) {
 		if (_strip) {
-			string path = "/strip/select";
-
-			lo_message msg = lo_message_new ();
-			if (feedback[2]) {
-				path = set_path (path);
-			} else {
-				lo_message_add_int32 (msg, ssid);
-			}
-			lo_message_add_float (msg, _strip->is_selected());
-			lo_send_message (addr, path.c_str(), msg);
-			lo_message_free (msg);
+			_osc.float_message_with_id ("/strip/select", ssid, _strip->is_selected(), addr);
 		}
 	}
 }