X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fsurfaces%2Fosc%2Fosc.cc;h=5f757b9105b60c2e19cd72a875b10fe5009d2287;hb=2a809dcf7005ab91bc297ef88365822728c06c56;hp=9818514e3683b30f787c32dc189e6b915f9569df;hpb=33bfe681c94f7c9ba36a683521daf74b5834b3e9;p=ardour.git

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 9818514e36..5f757b9105 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -332,6 +332,7 @@ OSC::stop ()
 	periodic_connection.disconnect ();
 	session_connections.drop_connections ();
 	cueobserver_connections.drop_connections ();
+	Glib::Threads::Mutex::Lock lm (surfaces_lock);
 	// Delete any active route observers
 	for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
 
@@ -537,11 +538,13 @@ OSC::register_callbacks()
 		// controls for "special" strips
 		REGISTER_CALLBACK (serv, "/master/gain", "f", master_set_gain);
 		REGISTER_CALLBACK (serv, "/master/fader", "f", master_set_fader);
+		REGISTER_CALLBACK (serv, "/master/db_delta", "f", master_delta_gain);
 		REGISTER_CALLBACK (serv, "/master/mute", "i", master_set_mute);
 		REGISTER_CALLBACK (serv, "/master/trimdB", "f", master_set_trim);
 		REGISTER_CALLBACK (serv, "/master/pan_stereo_position", "f", master_set_pan_stereo_position);
 		REGISTER_CALLBACK (serv, "/monitor/gain", "f", monitor_set_gain);
 		REGISTER_CALLBACK (serv, "/monitor/fader", "f", monitor_set_fader);
+		REGISTER_CALLBACK (serv, "/monitor/db_delta", "f", monitor_delta_gain);
 		REGISTER_CALLBACK (serv, "/monitor/mute", "i", monitor_set_mute);
 		REGISTER_CALLBACK (serv, "/monitor/dim", "i", monitor_set_dim);
 		REGISTER_CALLBACK (serv, "/monitor/mono", "i", monitor_set_mono);
@@ -558,6 +561,7 @@ OSC::register_callbacks()
 		REGISTER_CALLBACK (serv, "/select/polarity", "i", sel_phase);
 		REGISTER_CALLBACK (serv, "/select/gain", "f", sel_gain);
 		REGISTER_CALLBACK (serv, "/select/fader", "f", sel_fader);
+		REGISTER_CALLBACK (serv, "/select/db_delta", "f", sel_dB_delta);
 		REGISTER_CALLBACK (serv, "/select/trimdB", "f", sel_trim);
 		REGISTER_CALLBACK (serv, "/select/pan_stereo_position", "f", sel_pan_position);
 		REGISTER_CALLBACK (serv, "/select/pan_stereo_width", "f", sel_pan_width);
@@ -1249,6 +1253,10 @@ OSC::routes_list (lo_message msg)
 				lo_message_add_string (reply, "MB");
 			} else if (s->presentation_info().flags() & PresentationInfo::VCA) {
 				lo_message_add_string (reply, "V");
+			} else if (s->is_master()) {
+				lo_message_add_string (reply, "MA");
+			} else if (s->is_monitor()) {
+				lo_message_add_string (reply, "MO");
 			}
 
 			lo_message_add_string (reply, s->name().c_str());
@@ -1333,11 +1341,6 @@ OSC::get_address (lo_message msg)
 int
 OSC::refresh_surface (lo_message msg)
 {
-	if (address_only) {
-		// get rid of all surfaces and observers.
-		// needs change to only clear those for this address on all ports
-		clear_devices();
-	}
 	OSCSurface *s = get_surface(get_address (msg));
 	// restart all observers
 	set_surface (s->bank_size, (uint32_t) s->strip_types.to_ulong(), (uint32_t) s->feedback.to_ulong(), \
@@ -1348,6 +1351,8 @@ OSC::refresh_surface (lo_message msg)
 void
 OSC::clear_devices ()
 {
+	tick = false;
+	Glib::Threads::Mutex::Lock lm (surfaces_lock);
 	for (RouteObservers::iterator x = route_observers.begin(); x != route_observers.end();) {
 
 		OSCRouteObserver* rc;
@@ -1394,6 +1399,7 @@ OSC::clear_devices ()
 
 	// clear out surfaces
 	_surface.clear();
+	tick = true;
 }
 
 int
@@ -1410,81 +1416,82 @@ OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc
 
 
 	if (!strncmp (path, "/set_surface/feedback", 21)) {
-		if (argv[0]->f) {
+		if (types[0] == 'f') {
 			ret = set_surface_feedback ((int)argv[0]->f, msg);
 		} else {
 			ret = set_surface_feedback (argv[0]->i, msg);
 		}
 	}
 	else if (!strncmp (path, "/set_surface/bank_size", 22)) {
-		if (argv[0]->f) {
+		if (types[0] == 'f') {
 			ret = set_surface_bank_size ((int)argv[0]->f, msg);
 		} else {
 			ret = set_surface_bank_size (argv[0]->i, msg);
 		}
 	}
 	else if (!strncmp (path, "/set_surface/gainmode", 21)) {
-		if (argv[0]->f) {
+		if (types[0] == 'f') {
 			ret = set_surface_gainmode ((int)argv[0]->f, msg);
 		} else {
 			ret = set_surface_gainmode (argv[0]->i, msg);
 		}
 	}
 	else if (!strncmp (path, "/set_surface/strip_types", 24)) {
-		if (argv[0]->f) {
+		if (types[0] == 'f') {
 			ret = set_surface_strip_types ((int)argv[0]->f, msg);
 		} else {
 			ret = set_surface_strip_types (argv[0]->i, msg);
 		}
 	}
 	else if (!strncmp (path, "/set_surface/send_page_size", 27)) {
-		if (argv[0]->f) {
+		if (types[0] == 'f') {
 			ret = sel_send_pagesize ((int)argv[0]->f, msg);
 		} else {
 			ret = sel_send_pagesize (argv[0]->i, msg);
 		}
 	}
 	else if (!strncmp (path, "/set_surface/plugin_page_size", 29)) {
-		if (argv[0]->f) {
+		if (types[0] == 'f') {
 			ret = sel_plug_pagesize ((int)argv[0]->f, msg);
 		} else {
 			ret = sel_plug_pagesize (argv[0]->i, msg);
 		}
 	} else if (strlen(path) == 12) {
+
 		// command is in /set_surface iii form
 		switch (argc) {
 			case 6:
-				if (argv[5]->f) {
+				if (types[5] == 'f') {
 					pi_page = (int) argv[5]->f;
 				} else {
 					pi_page = argv[5]->i;
 				}
 			case 5:
-				if (argv[4]->f) {
+				if (types[4] == 'f') {
 					se_page = (int) argv[4]->f;
 				} else {
 					se_page = argv[4]->i;
 				}
 			case 4:
-				if (argv[3]->f) {
+				if (types[3] == 'f') {
 					fadermode = (int) argv[3]->f;
 				} else {
 					fadermode = argv[3]->i;
 				}
 			case 3:
-				if (argv[2]->f) {
+				if (types[2] == 'f') {
 					feedback = (int) argv[2]->f;
 				} else {
 					feedback = argv[2]->i;
 				}
 			case 2:
-				if (argv[1]->f) {
+				if (types[1] == 'f') {
 					strip_types = (int) argv[1]->f;
 				} else {
 					strip_types = argv[1]->i;
 				}
 			case 1:
-				if (argv[0]->f) {
+				if (types[0] == 'f') {
 					bank_size = (int) argv[0]->f;
 				} else {
 					bank_size = argv[0]->i;
@@ -1531,37 +1538,37 @@ OSC::surface_parse (const char *path, const char* types, lo_arg **argv, int argc
 						if (pp) {
 							pi_page = atoi (&pp[1]);
 						} else {
-							if (argv[0]->f) {
+							if (types[0] == 'f') {
 								pi_page = (int) argv[0]->f;
-							} else if (argv[0]->i) {
+							} else if (types[0] == 'i') {
 								pi_page = argv[0]->i;
 							}
 						}
 					} else {
-						if (argv[0]->f) {
+						if (types[0] == 'f') {
 							se_page = (int) argv[0]->f;
-						} else if (argv[0]->i) {
+						} else if (types[0] == 'i') {
 							se_page = argv[0]->i;
 						}
 					}
 				} else {
-					if (argv[0]->f) {
+					if (types[0] == 'f') {
 						fadermode = (int) argv[0]->f;
-					} else if (argv[0]->i) {
+					} else if (types[0] == 'i') {
 						fadermode = argv[0]->i;
 					}
 				}
 			} else {
-				if (argv[0]->f) {
+				if (types[0] == 'f') {
 					feedback = (int) argv[0]->f;
-				} else if (argv[0]->i) {
+				} else if (types[0] == 'i') {
 					feedback = argv[0]->i;
 				}
 			}
 		} else {
-			if (argv[0]->f) {
+			if (types[0] == 'f') {
 				strip_types = (int) argv[0]->f;
-			} else if (argv[0]->i) {
+			} else if (types[0] == 'i') {
 				strip_types = argv[0]->i;
 			}
 		}
@@ -1664,10 +1671,13 @@ OSC::get_surface (lo_address addr)
 	rurl = lo_address_get_url (addr);
 	r_url = rurl;
 	free (rurl);
-	for (uint32_t it = 0; it < _surface.size(); ++it) {
-		//find setup for this server
-		if (!_surface[it].remote_url.find(r_url)){
-			return &_surface[it];
+	{
+		Glib::Threads::Mutex::Lock lm (surfaces_lock);
+		for (uint32_t it = 0; it < _surface.size(); ++it) {
+			//find setup for this server
+			if (!_surface[it].remote_url.find(r_url)){
+				return &_surface[it];
+			}
 		}
 	}
 
@@ -1694,7 +1704,10 @@ OSC::get_surface (lo_address addr)
 	s.plugin_id = 1;
 
 	s.nstrips = s.strips.size();
-	_surface.push_back (s);
+	{
+		Glib::Threads::Mutex::Lock lm (surfaces_lock);
+		_surface.push_back (s);
+	}
 	// 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();
@@ -2346,7 +2359,33 @@ OSC::master_set_gain (float dB)
 		if (dB < -192) {
 			s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup);
 		} else {
-			s->gain_control()->set_value (dB_to_coefficient (dB), PBD::Controllable::NoGroup);
+			float abs = dB_to_coefficient (dB);
+			float top = s->gain_control()->upper();
+			if (abs > top) {
+				abs = top;
+			}
+			s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
+		}
+	}
+	return 0;
+}
+
+int
+OSC::master_delta_gain (float delta)
+{
+	if (!session) return -1;
+	boost::shared_ptr<Stripable> s = session->master_out();
+	if (s) {
+		float dB = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta;
+		if (dB < -192) {
+			s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup);
+		} else {
+			float abs = dB_to_coefficient (dB);
+			float top = s->gain_control()->upper();
+			if (abs > top) {
+				abs = top;
+			}
+			s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
 		}
 	}
 	return 0;
@@ -2427,7 +2466,33 @@ OSC::monitor_set_gain (float dB)
 		if (dB < -192) {
 			s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup);
 		} else {
-			s->gain_control()->set_value (dB_to_coefficient (dB), PBD::Controllable::NoGroup);
+			float abs = dB_to_coefficient (dB);
+			float top = s->gain_control()->upper();
+			if (abs > top) {
+				abs = top;
+			}
+			s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
+		}
+	}
+	return 0;
+}
+
+int
+OSC::monitor_delta_gain (float delta)
+{
+	if (!session) return -1;
+	boost::shared_ptr<Stripable> s = session->monitor_out();
+	if (s) {
+		float dB = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta;
+		if (dB < -192) {
+			s->gain_control()->set_value (0.0, PBD::Controllable::NoGroup);
+		} else {
+			float abs = dB_to_coefficient (dB);
+			float top = s->gain_control()->upper();
+			if (abs > top) {
+				abs = top;
+			}
+			s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
 		}
 	}
 	return 0;
@@ -2606,7 +2671,7 @@ OSC::set_automation (const char *path, const char* types, lo_arg **argv, int arg
 	uint32_t ssid;
 
 	if (argc) {
-		if (argv[argc - 1]->f) {
+		if (types[argc - 1] == 'f') {
 			aut = (int)argv[argc - 1]->f;
 		} else {
 			aut = argv[argc - 1]->i;
@@ -2692,7 +2757,7 @@ OSC::touch_detect (const char *path, const char* types, lo_arg **argv, int argc,
 	uint32_t ssid;
 
 	if (argc) {
-		if (argv[argc - 1]->f) {
+		if (types[argc - 1] == 'f') {
 			touch = (int)argv[argc - 1]->f;
 		} else {
 			touch = argv[argc - 1]->i;
@@ -3147,7 +3212,7 @@ OSC::_strip_select (boost::shared_ptr<Stripable> s, lo_address addr)
 		delete sur->sel_obs;
 		sur->sel_obs = 0;
 	}
-	bool feedback_on = sur->feedback.to_ulong();
+	bool feedback_on = sur->feedback[13];
 	if (s && feedback_on) {
 		OSCSelectObserver* sel_fb = new OSCSelectObserver (s, addr, sur);
 		s->DropReferences.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
@@ -3324,12 +3389,47 @@ OSC::sel_gain (float val, lo_message msg)
 	}
 	if (s) {
 		float abs;
-		if (val < -192) {
-			abs = 0;
-		} else {
-			abs = dB_to_coefficient (val);
+		if (s->gain_control()) {
+			if (val < -192) {
+				abs = 0;
+			} else {
+				abs = dB_to_coefficient (val);
+				float top = s->gain_control()->upper();
+				if (abs > top) {
+					abs = top;
+				}
+			}
+			fake_touch (s->gain_control());
+			s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
+			return 0;
 		}
+	}
+	return sel_fail ("gain", -193, get_address (msg));
+}
+
+int
+OSC::sel_dB_delta (float delta, lo_message msg)
+{
+	OSCSurface *sur = get_surface(get_address (msg));
+	boost::shared_ptr<Stripable> s;
+	if (sur->expand_enable) {
+		s = get_strip (sur->expand, get_address (msg));
+	} else {
+		s = _select;
+	}
+	if (s) {
 		if (s->gain_control()) {
+			float dB = accurate_coefficient_to_dB (s->gain_control()->get_value()) + delta;
+			float abs;
+			if (dB < -192) {
+				abs = 0;
+			} else {
+				abs = dB_to_coefficient (dB);
+				float top = s->gain_control()->upper();
+				if (abs > top) {
+					abs = top;
+				}
+			}
 			fake_touch (s->gain_control());
 			s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
 			return 0;
@@ -3371,6 +3471,10 @@ OSC::strip_db_delta (int ssid, float delta, lo_message msg)
 			abs = 0;
 		} else {
 			abs = dB_to_coefficient (db);
+			float top = s->gain_control()->upper();
+			if (abs > top) {
+				abs = top;
+			}
 		}
 		s->gain_control()->set_value (abs, PBD::Controllable::NoGroup);
 		return 0;
@@ -3582,7 +3686,7 @@ OSC::sel_sendgain (int id, float val, lo_message msg)
 		s = _select;
 	}
 	float abs;
-	int send_id;
+	int send_id = 0;
 	if (s) {
 		if (id > 0) {
 			send_id = id - 1;
@@ -3621,7 +3725,7 @@ OSC::sel_sendfader (int id, float val, lo_message msg)
 		s = _select;
 	}
 	float abs;
-	int send_id;
+	int send_id = 0;
 	if (s) {
 
 		if (id > 0) {
@@ -3695,7 +3799,7 @@ OSC::sel_sendenable (int id, float val, lo_message msg)
 	} else {
 		s = _select;
 	}
-	int send_id;
+	int send_id = 0;
 	if (s) {
 		if (id > 0) {
 			send_id = id - 1;
@@ -3756,20 +3860,20 @@ OSC::select_plugin_parameter (const char *path, const char* types, lo_arg **argv
 		// no inline args
 		if (argc == 2) {
 			// change parameter in already selected plugin
-			if (argv[0]->f) {
+			if (types[0]  == 'f') {
 				paid = (int) argv[0]->f;
 			} else {
 				paid = argv[0]->i;
 			}
 			value = argv[1]->f;
 		} else if (argc == 3) {
-			if (argv[0]->f) {
+			if (types[0] == 'f') {
 				piid = (int) argv[0]->f;
 			} else {
 				piid = argv[0]->i;
 			}
 			_sel_plugin (piid, get_address (msg));
-			if (argv[1]->f) {
+			if (types[1] == 'f') {
 				paid = (int) argv[1]->f;
 			} else {
 				paid = argv[1]->i;
@@ -3931,51 +4035,82 @@ OSC::route_plugin_descriptor (int ssid, int piid, lo_message msg) {
 	lo_message reply = lo_message_new();
 	lo_message_add_int32 (reply, ssid);
 	lo_message_add_int32 (reply, piid);
-	lo_message_add_string (reply, pip->name());
+	lo_message_add_int32(reply, redi->enabled() ? 1 : 0);
+
 	for ( uint32_t ppi = 0; ppi < pip->parameter_count(); ppi++) {
 
 		uint32_t controlid = pip->nth_parameter(ppi, ok);
 		if (!ok) {
 			continue;
 		}
-		if ( pip->parameter_is_input(controlid) || pip->parameter_is_control(controlid) ) {
-			boost::shared_ptr<AutomationControl> c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid));
-
-				lo_message_add_int32 (reply, ppi + 1);
-				ParameterDescriptor pd;
-				pi->plugin()->get_parameter_descriptor(controlid, pd);
-				lo_message_add_string (reply, pd.label.c_str());
-
-				// I've combined those binary descriptor parts in a bit-field to reduce lilo message elements
-				int flags = 0;
-				flags |= pd.enumeration ? 1 : 0;
-				flags |= pd.integer_step ? 2 : 0;
-				flags |= pd.logarithmic ? 4 : 0;
-				flags |= pd.sr_dependent ? 32 : 0;
-				flags |= pd.toggled ? 64 : 0;
-				flags |= c != NULL ? 128 : 0; // bit 7 indicates in input control
-				lo_message_add_int32 (reply, flags);
-
-				lo_message_add_int32 (reply, pd.datatype);
-				lo_message_add_float (reply, pd.lower);
-				lo_message_add_float (reply, pd.upper);
-				lo_message_add_string (reply, pd.print_fmt.c_str());
-				if ( pd.scale_points ) {
-					lo_message_add_int32 (reply, pd.scale_points->size());
-					for ( ARDOUR::ScalePoints::const_iterator i = pd.scale_points->begin(); i != pd.scale_points->end(); ++i) {
-						lo_message_add_int32 (reply, i->second);
-						lo_message_add_string (reply, ((std::string)i->first).c_str());
-					}
-				}
-				else {
-					lo_message_add_int32 (reply, 0);
-				}
-				if ( c ) {
-					lo_message_add_double (reply, c->get_value());
-				}
-				else {
-					lo_message_add_double (reply, 0);
+		boost::shared_ptr<AutomationControl> c = pi->automation_control(Evoral::Parameter(PluginAutomation, 0, controlid));
+
+		lo_message_add_int32 (reply, ppi + 1);
+		ParameterDescriptor pd;
+		pi->plugin()->get_parameter_descriptor(controlid, pd);
+		lo_message_add_string (reply, pd.label.c_str());
+
+		// I've combined those binary descriptor parts in a bit-field to reduce lilo message elements
+		int flags = 0;
+		flags |= pd.enumeration ? 1 : 0;
+		flags |= pd.integer_step ? 2 : 0;
+		flags |= pd.logarithmic ? 4 : 0;
+		flags |= pd.sr_dependent ? 32 : 0;
+		flags |= pd.toggled ? 64 : 0;
+		lo_message_add_int32 (reply, flags);
+
+		switch(pd.datatype) {
+			case ARDOUR::Variant::BEATS:
+				lo_message_add_string(reply, _("BEATS"));
+				break;
+			case ARDOUR::Variant::BOOL:
+				lo_message_add_string(reply, _("BOOL"));
+				break;
+			case ARDOUR::Variant::DOUBLE:
+				lo_message_add_string(reply, _("DOUBLE"));
+				break;
+			case ARDOUR::Variant::FLOAT:
+				lo_message_add_string(reply, _("FLOAT"));
+				break;
+			case ARDOUR::Variant::INT:
+				lo_message_add_string(reply, _("INT"));
+				break;
+			case ARDOUR::Variant::LONG:
+				lo_message_add_string(reply, _("LONG"));
+				break;
+			case ARDOUR::Variant::NOTHING:
+				lo_message_add_string(reply, _("NOTHING"));
+				break;
+			case ARDOUR::Variant::PATH:
+				lo_message_add_string(reply, _("PATH"));
+				break;
+			case ARDOUR::Variant::STRING:
+				lo_message_add_string(reply, _("STRING"));
+				break;
+			case ARDOUR::Variant::URI:
+				lo_message_add_string(reply, _("URI"));
+				break;
+			default:
+				lo_message_add_string(reply, _("UNKNOWN"));
+				break;
+		}
+
+		lo_message_add_float (reply, pd.lower);
+		lo_message_add_float (reply, pd.upper);
+		lo_message_add_string (reply, pd.print_fmt.c_str());
+		if ( pd.scale_points ) {
+			lo_message_add_int32 (reply, pd.scale_points->size());
+			for ( ARDOUR::ScalePoints::const_iterator i = pd.scale_points->begin(); i != pd.scale_points->end(); ++i) {
+				lo_message_add_int32 (reply, i->second);
+				lo_message_add_string (reply, ((std::string)i->first).c_str());
 			}
+		} else {
+			lo_message_add_int32 (reply, 0);
+		}
+		if ( c ) {
+			lo_message_add_double (reply, c->get_value());
+		} else {
+			lo_message_add_double (reply, 0);
 		}
 	}
 
@@ -4600,6 +4735,7 @@ OSC::periodic (void)
 	if (!tick) {
 		Glib::usleep(100); // let flurry of signals subside
 		if (global_init) {
+			Glib::Threads::Mutex::Lock lm (surfaces_lock);
 			for (uint32_t it = 0; it < _surface.size(); it++) {
 				OSCSurface* sur = &_surface[it];
 				lo_address addr = lo_address_new_from_url (sur->remote_url.c_str());
@@ -4757,25 +4893,6 @@ OSC::get_state ()
 	node.set_property ("gainmode", default_gainmode);
 	node.set_property ("send-page-size", default_send_size);
 	node.set_property ("plug-page-size", default_plugin_size);
-	if (_surface.size()) {
-		XMLNode* config = new XMLNode (X_("Configurations"));
-		for (uint32_t it = 0; it < _surface.size(); ++it) {
-			OSCSurface* sur = &_surface[it];
-			XMLNode* devnode = new XMLNode (X_("Configuration"));
-			devnode->set_property (X_("url"), sur->remote_url);
-			devnode->set_property (X_("bank-size"), sur->bank_size);
-			devnode->set_property (X_("strip-types"), (uint64_t)sur->strip_types.to_ulong());
-			devnode->set_property (X_("feedback"), (uint64_t)sur->feedback.to_ulong());
-			devnode->set_property (X_("gainmode"), sur->gainmode);
-			devnode->set_property (X_("send-page-size"), sur->send_page_size);
-			devnode->set_property (X_("plug-page-size"), sur->plug_page_size);
-			devnode->set_property (X_("no-clear"), sur->no_clear);
-			devnode->set_property (X_("cue"), sur->cue);
-			devnode->set_property (X_("aux"), sur->aux);
-			config->add_child_nocopy (*devnode);
-		}
-		node.add_child_nocopy (*config);
-	}
 	return node;
 }
 
@@ -4799,44 +4916,6 @@ OSC::set_state (const XMLNode& node, int version)
 	node.get_property (X_("send-page-size"), default_send_size);
 	node.get_property (X_("plugin-page-size"), default_plugin_size);
 
-	XMLNode* cnode = node.child (X_("Configurations"));
-
-	if (cnode) {
-		XMLNodeList const& devices = cnode->children();
-		for (XMLNodeList::const_iterator d = devices.begin(); d != devices.end(); ++d) {
-			OSCSurface s;
-			if (!(*d)->get_property (X_("url"), s.remote_url)) {
-				continue;
-			}
-
-			bank_dirty = true;
-
-			(*d)->get_property (X_("bank-size"), s.bank_size);
-
-			uint64_t bits;
-			if ((*d)->get_property (X_ ("strip-types"), bits)) {
-				s.strip_types = bits;
-			}
-			if ((*d)->get_property (X_("feedback"), bits)) {
-				s.feedback = bits;
-			}
-			(*d)->get_property (X_("gainmode"), s.gainmode);
-
-			(*d)->get_property (X_("send-page-size"), s.send_page_size);
-			(*d)->get_property (X_("plug-page-size"), s.plug_page_size);
-			(*d)->get_property (X_("no-clear"), s.no_clear);
-			(*d)->get_property (X_("cue"), s.cue);
-			(*d)->get_property (X_("aux"), s.aux);
-			s.bank = 1;
-			s.sel_obs = 0;
-			s.expand = 0;
-			s.expand_enable = false;
-			s.strips = get_sorted_stripables (s.strip_types, s.cue);
-			s.nstrips = s.strips.size ();
-			s.jogmode = JOG;
-			_surface.push_back (s);
-		}
-	}
 	global_init = true;
 	tick = false;