From f95335639e999d93a4eb1b50b6d0a30789de8f20 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 27 Aug 2016 14:24:10 +1000 Subject: [PATCH] Use XMLNode::get/set_property API in ARDOUR::ChanCount class --- libs/ardour/chan_count.cc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libs/ardour/chan_count.cc b/libs/ardour/chan_count.cc index 42f9994ae3..956f3fdef9 100644 --- a/libs/ardour/chan_count.cc +++ b/libs/ardour/chan_count.cc @@ -20,6 +20,7 @@ #include #include "ardour/chan_count.h" +#include "ardour/types_convert.h" #include "pbd/i18n.h" @@ -38,9 +39,11 @@ ChanCount::ChanCount(const XMLNode& node) XMLNodeConstIterator iter = node.children().begin(); for ( ; iter != node.children().end(); ++iter) { if ((*iter)->name() == X_(state_node_name)) { - const string& type_str = (*iter)->property("type")->value(); - const string& count_str = (*iter)->property("count")->value(); - set(DataType(type_str), atol(count_str.c_str())); + DataType type(DataType::NIL); + uint32_t count; + (*iter)->get_property("type", type); + (*iter)->get_property("count", count); + set(type, count); } } } @@ -65,8 +68,8 @@ ChanCount::state(const std::string& name) const uint32_t count = get(*t); if (count > 0) { XMLNode* n = new XMLNode(X_(state_node_name)); - n->add_property("type", (*t).to_string()); - n->add_property("count", count); + n->set_property("type", *t); + n->set_property("count", count); node->add_child_nocopy(*n); } }