Move MIDI control port ownership into the MIDI Manager, since control port state should be Ardour-wide, not per-session. Fix up port connection state management.

git-svn-id: svn://localhost/ardour2/branches/3.0@7394 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 12 insertions, 3 deletions

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index a50a994f87..3ca4868f63 100644
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -68,6 +68,10 @@ RCConfiguration::RCConfiguration ()
 
 RCConfiguration::~RCConfiguration ()
 {
+	for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
+		delete *i;
+	}
+
 	delete _control_protocol_state;
 }
 
@@ -254,19 +258,24 @@ RCConfiguration::set_state (const XMLNode& root, int /*version*/)
 	XMLNodeConstIterator niter;
 	XMLNode *node;
 
+	for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
+		delete *i;
+	}
+
+	_midi_port_states.clear ();
+
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
 		node = *niter;
 
 		if (node->name() == "Config") {
-
 			set_variables (*node);
-
 		} else if (node->name() == "Extra") {
 			_extra_xml = new XMLNode (*node);
-
 		} else if (node->name() == ControlProtocolManager::state_node_name) {
 			_control_protocol_state = new XMLNode (*node);
+		} else if (node->name() == MIDI::Port::state_node_name) {
+			_midi_port_states.push_back (new XMLNode (*node));
 		}
 	}