a) completely refactor abstract UI code

b) single-thread Tranzport implementation
c) implement BasicUI to share functionality across multiple
     controllers
d) various minor fixes here and there


git-svn-id: svn://localhost/trunk/ardour2@468 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 7 insertions, 0 deletions

diff --git a/libs/ardour/configuration.cc b/libs/ardour/configuration.cc
index 1581e5216e..b7b1d65815 100644
--- a/libs/ardour/configuration.cc
+++ b/libs/ardour/configuration.cc
@@ -28,6 +28,7 @@
 #include <ardour/configuration.h>
 #include <ardour/diskstream.h>
 #include <ardour/destructive_filesource.h>
+#include <ardour/control_protocol_manager.h>
 
 #include "i18n.h"
 
@@ -55,6 +56,7 @@ Configuration::Configuration ()
 
 	user_configuration (false)
 {
+	_control_protocol_state = 0;
 }
 
 Configuration::~Configuration ()
@@ -174,6 +176,8 @@ Configuration::state (bool user_only)
 		root->add_child_copy (*_extra_xml);
 	}
 
+	root->add_child_nocopy (ControlProtocolManager::instance().get_state());
+
 	return *root;
 }
 
@@ -221,6 +225,9 @@ Configuration::set_state (const XMLNode& root)
 			
 		} else if (node->name() == "extra") {
 			_extra_xml = new XMLNode (*node);
+
+		} else if (node->name() == ControlProtocolManager::state_node_name) {
+			_control_protocol_state = new XMLNode (*node);
 		}
 	}