1 files changed, 47 insertions, 2 deletions

diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc
index 5c02936ba0..1ff6c28ef3 100644
--- a/libs/ardour/control_protocol_manager.cc
+++ b/libs/ardour/control_protocol_manager.cc
@@ -50,7 +50,7 @@ ControlProtocolManager::set_session (Session& s)
 			instantiate (**i);
 			(*i)->requested = false;
 
-			if ((*i)->state) {
+			if ((*i)->protocol && (*i)->state) {
 				(*i)->protocol->set_state (*(*i)->state);
 			}
 		}
@@ -93,6 +93,10 @@ ControlProtocolManager::instantiate (ControlProtocolInfo& cpi)
 	Glib::Mutex::Lock lm (protocols_lock);
 	control_protocols.push_back (cpi.protocol);
 
+	if (cpi.state) {
+		cpi.protocol->set_state (*cpi.state);
+	}
+
 	return cpi.protocol;
 }
 
@@ -154,7 +158,7 @@ ControlProtocolManager::discover_control_protocols (string path)
 	vector<string *> *found;
 	PathScanner scanner;
 
-	cerr << "looking for control protocols in " << path << endl;
+	info << string_compose (_("looking for control protocols in %1"), path) << endmsg;
 
 	found = scanner (path, protocol_filter, 0, false, true);
 
@@ -185,6 +189,7 @@ ControlProtocolManager::control_protocol_discover (string path)
 			cpi->protocol = 0;
 			cpi->requested = false;
 			cpi->mandatory = descriptor->mandatory;
+			cpi->supports_feedback = descriptor->supports_feedback;
 			cpi->state = 0;
 			
 			control_protocol_info.push_back (cpi);
@@ -261,11 +266,20 @@ ControlProtocolManager::set_state (const XMLNode& node)
 
 	for (citer = clist.begin(); citer != clist.end(); ++citer) {
 		if ((*citer)->name() == X_("Protocol")) {
+
 			prop = (*citer)->property (X_("active"));
+
 			if (prop && prop->value() == X_("yes")) {
 				if ((prop = (*citer)->property (X_("name"))) != 0) {
 					ControlProtocolInfo* cpi = cpi_by_name (prop->value());
 					if (cpi) {
+
+						if (!(*citer)->children().empty()) {
+							cpi->state = (*citer)->children().front ();
+						} else {
+							cpi->state = 0;
+						}
+						
 						if (_session) {
 							instantiate (*cpi);
 						} else {
@@ -294,3 +308,34 @@ ControlProtocolManager::get_state (void)
 
 	return *root;
 }
+
+void
+ControlProtocolManager::set_protocol_states (const XMLNode& node)
+{
+	XMLNodeList nlist;
+	XMLNodeConstIterator niter;
+	XMLProperty* prop;
+
+	nlist = node.children();
+
+	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+
+		XMLNode* child = (*niter);
+
+		if ((prop = child->property ("name")) == 0) {
+			error << _("control protocol XML node has no name property. Ignored.") << endmsg;
+			continue;
+		}
+
+		ControlProtocolInfo* cpi = cpi_by_name (prop->value());
+
+		if (!cpi) {
+			warning << string_compose (_("control protocol \"%1\" is not known. Ignored"), prop->value()) << endmsg;
+			continue;
+		}
+
+		/* copy the node so that ownership is clear */
+
+		cpi->state = new XMLNode (*child);
+	}
+}