X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fuser_bundle.cc;h=312a3c58ed564ae106a38b2e6dba9265f86c69cf;hb=848db8fbd56dbae1ad286b7791dba293462b5f43;hp=16ecb88c8da5a3e48a103babf39cfbf72cff0ad3;hpb=8713667ec1a6cc9ba56c07f763e5a422cc47fbef;p=ardour.git

diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc
index 16ecb88c8d..312a3c58ed 100644
--- a/libs/ardour/user_bundle.cc
+++ b/libs/ardour/user_bundle.cc
@@ -1,13 +1,28 @@
-#include <cassert>
-#include "pbd/failed_constructor.h"
-#include "pbd/compose.h"
-#include "pbd/xml++.h"
+/*
+    Copyright (C) 2012 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include "ardour/user_bundle.h"
-#include "ardour/port_set.h"
-#include "ardour/io.h"
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
 #include "i18n.h"
+#include "pbd/compose.h"
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/xml++.h"
 
 ARDOUR::UserBundle::UserBundle (std::string const & n)
 	: Bundle (n)
@@ -24,7 +39,7 @@ ARDOUR::UserBundle::UserBundle (XMLNode const & node, bool i)
 }
 
 int
-ARDOUR::UserBundle::set_state (XMLNode const & node, int version)
+ARDOUR::UserBundle::set_state (XMLNode const & node, int /*version*/)
 {
 	XMLProperty const * name;
 
@@ -50,7 +65,13 @@ ARDOUR::UserBundle::set_state (XMLNode const & node, int version)
 			return -1;
 		}
 
-		add_channel (name->value ());
+		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 ();
 
@@ -88,11 +109,12 @@ ARDOUR::UserBundle::get_state ()
 	node->add_property ("name", name ());
 
 	{
-		Glib::Mutex::Lock lm (_channel_mutex);
+		Glib::Threads::Mutex::Lock lm (_channel_mutex);
 
 		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");