X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fuser_bundle.cc;h=4c39c5f5fff21ca5e73822e9670ae6a252b3248d;hb=7d96960b162d25da87c388a3083775e8770bba56;hp=1abb3fba877c48e77c59d336f287ae37d837d925;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc
index 1abb3fba87..4c39c5f5ff 100644
--- a/libs/ardour/user_bundle.cc
+++ b/libs/ardour/user_bundle.cc
@@ -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;
@@ -49,7 +49,7 @@ ARDOUR::UserBundle::set_state (XMLNode const & node)
 			PBD::error << _("Node for Channel has no \"name\" property") << endmsg;
 			return -1;
 		}
-		
+
 		add_channel (name->value ());
 
 		XMLNodeList const ports = (*i)->children ();
@@ -63,8 +63,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 ());
 		}
 
@@ -78,7 +78,7 @@ XMLNode&
 ARDOUR::UserBundle::get_state ()
 {
 	XMLNode *node;
-	
+
 	if (ports_are_inputs ()) {
 		node = new XMLNode ("InputBundle");
 	} else {
@@ -93,13 +93,13 @@ 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);
-			
+
 			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);
 		}
 	}