X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fuser_bundle.cc;h=b6c38e0eedf8b35084455fc233434bae719be992;hb=9756b7569accf82d1c2de87cd632845acd107f9d;hp=2dee0af01eeaa74836d7b1becaae1dc9d7cdb49b;hpb=61db2175eb8b8fffd0c1796ace78ac33c9e1adf0;p=ardour.git

diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc
index 2dee0af01e..b6c38e0eed 100644
--- a/libs/ardour/user_bundle.cc
+++ b/libs/ardour/user_bundle.cc
@@ -1,7 +1,7 @@
 #include <cassert>
-#include <pbd/failed_constructor.h>
-#include <pbd/compose.h>
-#include <pbd/xml++.h>
+#include "pbd/failed_constructor.h"
+#include "pbd/compose.h"
+#include "pbd/xml++.h"
 #include "ardour/user_bundle.h"
 #include "ardour/port_set.h"
 #include "ardour/io.h"
@@ -15,19 +15,19 @@ ARDOUR::UserBundle::UserBundle (std::string const & n)
 
 }
 
-ARDOUR::UserBundle::UserBundle (XMLNode const & x, bool i)
+ARDOUR::UserBundle::UserBundle (XMLNode const & node, bool i)
 	: Bundle (i)
 {
-	if (set_state (x)) {
+	if (set_state (node, Stateful::loading_state_version)) {
 		throw failed_constructor ();
 	}
 }
 
 int
-ARDOUR::UserBundle::set_state (XMLNode const & node)
+ARDOUR::UserBundle::set_state (XMLNode const & node, int /*version*/)
 {
 	XMLProperty const * name;
-	
+
 	if ((name = node.property ("name")) == 0) {
 		PBD::error << _("Node for Bundle has no \"name\" property") << endmsg;
 		return -1;
@@ -45,7 +45,18 @@ ARDOUR::UserBundle::set_state (XMLNode const & node)
 			return -1;
 		}
 
-		add_channel ("XXX");
+		if ((name = (*i)->property ("name")) == 0) {
+			PBD::error << _("Node for Channel has no \"name\" property") << endmsg;
+			return -1;
+		}
+
+		XMLProperty const * type;
+		if ((type = (*i)->property ("type")) == 0) {
+			PBD::error << _("Node for Channel has no \"type\" property") << endmsg;
+			return -1;
+		}
+
+		add_channel (name->value (), DataType (type->value()));
 
 		XMLNodeList const ports = (*i)->children ();
 
@@ -58,8 +69,8 @@ ARDOUR::UserBundle::set_state (XMLNode const & node)
 			if ((name = (*j)->property ("name")) == 0) {
 				PBD::error << _("Node for Port has no \"name\" property") << endmsg;
 				return -1;
-			} 
-			
+			}
+
 			add_port_to_channel (n, name->value ());
 		}
 
@@ -73,7 +84,7 @@ XMLNode&
 ARDOUR::UserBundle::get_state ()
 {
 	XMLNode *node;
-	
+
 	if (ports_are_inputs ()) {
 		node = new XMLNode ("InputBundle");
 	} else {
@@ -88,13 +99,14 @@ ARDOUR::UserBundle::get_state ()
 		for (std::vector<Channel>::iterator i = _channel.begin(); i != _channel.end(); ++i) {
 			XMLNode* c = new XMLNode ("Channel");
 			c->add_property ("name", i->name);
-			
+			c->add_property ("type", i->type.to_string());
+
 			for (PortList::iterator j = i->ports.begin(); j != i->ports.end(); ++j) {
 				XMLNode* p = new XMLNode ("Port");
 				p->add_property ("name", *j);
 				c->add_child_nocopy (*p);
 			}
-			
+
 			node->add_child_nocopy (*c);
 		}
 	}