#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"
}
-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;
return -1;
}
- add_channel ();
+ 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 ();
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 ());
}
ARDOUR::UserBundle::get_state ()
{
XMLNode *node;
-
+
if (ports_are_inputs ()) {
node = new XMLNode ("InputBundle");
} else {
node->add_property ("name", name ());
{
- Glib::Mutex::Lock lm (_ports_mutex);
+ Glib::Mutex::Lock lm (_channel_mutex);
- for (std::vector<PortList>::iterator i = _ports.begin(); i != _ports.end(); ++i) {
-
+ for (std::vector<Channel>::iterator i = _channel.begin(); i != _channel.end(); ++i) {
XMLNode* c = new XMLNode ("Channel");
-
- for (PortList::iterator j = i->begin(); j != i->end(); ++j) {
+ 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);
}
}