From 12ffebab05968983fa66a021b5142ab2e138726f Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sun, 28 Aug 2016 21:41:22 +1000 Subject: Use XMLNode::get/set_property API in ARDOUR::Source class --- libs/ardour/source.cc | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) (limited to 'libs') diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc index 1dcf612588..187eee8085 100644 --- a/libs/ardour/source.cc +++ b/libs/ardour/source.cc @@ -33,15 +33,21 @@ #include "pbd/xml++.h" #include "pbd/pthread_utils.h" #include "pbd/enumwriter.h" +#include "pbd/types_convert.h" #include "ardour/debug.h" #include "ardour/profile.h" #include "ardour/session.h" #include "ardour/source.h" #include "ardour/transient_detector.h" +#include "ardour/types_convert.h" #include "pbd/i18n.h" +namespace PBD { + DEFINE_ENUM_CONVERT(ARDOUR::Source::Flag); +} + using namespace std; using namespace ARDOUR; using namespace PBD; @@ -94,16 +100,14 @@ XMLNode& Source::get_state () { XMLNode *node = new XMLNode ("Source"); - char buf[64]; - node->add_property ("name", name()); - node->add_property ("type", _type.to_string()); - node->add_property (X_("flags"), enum_2_string (_flags)); - node->add_property ("id", id().to_s()); + node->set_property ("name", name()); + node->set_property ("type", _type); + node->set_property (X_("flags"), _flags); + node->set_property ("id", id()); if (_timestamp != 0) { - snprintf (buf, sizeof (buf), "%ld", _timestamp); - node->add_property ("timestamp", buf); + node->set_property ("timestamp", (int64_t)_timestamp); } return *node; @@ -112,10 +116,9 @@ Source::get_state () int Source::set_state (const XMLNode& node, int version) { - XMLProperty const * prop; - - if ((prop = node.property ("name")) != 0) { - _name = prop->value(); + std::string str; + if (node.get_property ("name", str)) { + _name = str; } else { return -1; } @@ -124,23 +127,19 @@ Source::set_state (const XMLNode& node, int version) return -1; } - if ((prop = node.property ("type")) != 0) { - _type = DataType(prop->value()); - } + node.get_property ("type", _type); - if ((prop = node.property ("timestamp")) != 0) { - sscanf (prop->value().c_str(), "%ld", &_timestamp); + int64_t t; + if (node.get_property ("timestamp", t)) { + _timestamp = t; } - if ((prop = node.property (X_("flags"))) != 0) { - _flags = Flag (string_2_enum (prop->value(), _flags)); - } else { + if (!node.get_property (X_("flags"), _flags)) { _flags = Flag (0); - } /* old style, from the period when we had DestructiveFileSource */ - if ((prop = node.property (X_("destructive"))) != 0) { + if (node.get_property (X_("destructive"), str)) { _flags = Flag (_flags | Destructive); } -- cgit v1.2.3