major, substantive reworking of how we store GUI information (visibility, height) for automation data. old design stored (insufficient) identifying information plus actual data in a GUI-only XML node; new scheme adds GUI data via extra_xml node to each AutomationControl object. reworked public/private methods for showing/hiding TimeAxisView objects; changed labelling of automation tracks to just show the name of the controlled parameter - more info can be viewed in the tooltip for the track headers. NOTE: Session file format ALTERED. No data loss but track visibility may be different than previous ardour3 versions

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

1 files changed, 4 insertions, 8 deletions

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 0e8c93d75e..459ea67480 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1902,6 +1902,8 @@ Route::_set_state (const XMLNode& node, int version, bool /*call_base*/)
 	nlist = node.children();
 	XMLNode processor_state (X_("processor_state"));
 
+	Stateful::save_extra_xml (node);
+
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter){
 
 		child = *niter;
@@ -2015,10 +2017,6 @@ Route::_set_state (const XMLNode& node, int version, bool /*call_base*/)
 			XMLNode *cmt = *(child->children().begin());
 			_comment = cmt->content();
 
-		} else if (child->name() == X_("Extra")) {
-
-			_extra_xml = new XMLNode (*child);
-
 		} else if (child->name() == Controllable::xml_node_name && (prop = child->property("name")) != 0) {
 			if (prop->value() == "solo") {
 				_solo_control->set_state (*child, version);
@@ -2255,6 +2253,8 @@ Route::_set_state_2X (const XMLNode& node, int version)
 
 	set_processor_state_2X (redirect_nodes, version);
 
+	Stateful::save_extra_xml (node);
+
 	for (niter = nlist.begin(); niter != nlist.end(); ++niter){
 		child = *niter;
 
@@ -2265,10 +2265,6 @@ Route::_set_state_2X (const XMLNode& node, int version)
 			XMLNode *cmt = *(child->children().begin());
 			_comment = cmt->content();
 
-		} else if (child->name() == X_("extra")) {
-
-			_extra_xml = new XMLNode (*child);
-
 		} else if (child->name() == Controllable::xml_node_name && (prop = child->property("name")) != 0) {
 			if (prop->value() == X_("solo")) {
 				_solo_control->set_state (*child, version);