debug instrumentation for locate time

[ardour.git] / libs / ardour / user_bundle.cc

diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc
index 2dee0af01eeaa74836d7b1becaae1dc9d7cdb49b..ee98f02858f55bcff5235b579983ca755d166cd5 100644 (file)
--- a/libs/ardour/user_bundle.cc
+++ b/libs/ardour/user_bundle.cc
@@ -1,13 +1,29 @@
-#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 "ardour/types_convert.h"
+#include "pbd/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)
@@ -15,25 +31,24 @@ 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) {
+       std::string str;
+       if (!node.get_property ("name", str)) {
                PBD::error << _("Node for Bundle has no \"name\" property") << endmsg;
                return -1;
        }
 
-       set_name (name->value ());
+       set_name (str);
 
        XMLNodeList const channels = node.children ();
 
@@ -45,7 +60,18 @@ ARDOUR::UserBundle::set_state (XMLNode const & node)
                        return -1;
                }
 
-               add_channel ("XXX");
+               if (!(*i)->get_property ("name", str)) {
+                       PBD::error << _("Node for Channel has no \"name\" property") << endmsg;
+                       return -1;
+               }
+
+               DataType type(DataType::NIL);
+               if (!(*i)->get_property ("type", type)) {
+                       PBD::error << _("Node for Channel has no \"type\" property") << endmsg;
+                       return -1;
+               }
+
+               add_channel (str, type);
 
                XMLNodeList const ports = (*i)->children ();
 
@@ -55,12 +81,12 @@ ARDOUR::UserBundle::set_state (XMLNode const & node)
                                return -1;
                        }
 
-                       if ((name = (*j)->property ("name")) == 0) {
+                       if (!(*j)->get_property ("name", str)) {
                                PBD::error << _("Node for Port has no \"name\" property") << endmsg;
                                return -1;
-                       } 
-                       
-                       add_port_to_channel (n, name->value ());
+                       }
+
+                       add_port_to_channel (n, str);
                }
 
                ++n;
@@ -73,28 +99,29 @@ XMLNode&
 ARDOUR::UserBundle::get_state ()
 {
        XMLNode *node;
-       
+
        if (ports_are_inputs ()) {
                node = new XMLNode ("InputBundle");
        } else {
                node = new XMLNode ("OutputBundle");
        }
 
-       node->add_property ("name", name ());
+       node->set_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->set_property ("name", i->name);
+                       c->set_property ("type", i->type);
+
                        for (PortList::iterator j = i->ports.begin(); j != i->ports.end(); ++j) {
                                XMLNode* p = new XMLNode ("Port");
-                               p->add_property ("name", *j);
+                               p->set_property ("name", *j);
                                c->add_child_nocopy (*p);
                        }
-                       
+
                        node->add_child_nocopy (*c);
                }
        }