when stopping transport, revert _default_transport_speed to 1.0 if current speed...

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

diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc
index b20e79c69acd18665d82e23357d7c00f782f9740..2655d6bc7d817d516e78aa832a1eddf6515be304 100644 (file)
--- a/libs/ardour/user_bundle.cc
+++ b/libs/ardour/user_bundle.cc
@@ -1,13 +1,9 @@
-#include <cassert>
-#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"
-#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)
@@ -15,19 +11,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,8 +45,14 @@ ARDOUR::UserBundle::set_state (XMLNode const & node)
                        PBD::error << _("Node for Channel has no \"name\" property") << endmsg;
                        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 ();
 
@@ -63,8 +65,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 +80,7 @@ XMLNode&
 ARDOUR::UserBundle::get_state ()
 {
        XMLNode *node;
-       
+
        if (ports_are_inputs ()) {
                node = new XMLNode ("InputBundle");
        } else {
@@ -88,18 +90,19 @@ 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");
                                p->add_property ("name", *j);
                                c->add_child_nocopy (*p);
                        }
-                       
+
                        node->add_child_nocopy (*c);
                }
        }