ardour/livetrax
13
0
Fork 0
Code

Use XMLNode::get/set_property in ARDOUR::ChanMapping class

Browse Source 
This avoids possible demotion of unsigned integers when using the
add_property(char*, long) API. Which is unlikely to have ever been an issue but
worth noting.
This commit is contained in:
Tim Mayberry 2016-08-27 22:27:10 +10:00
parent 9c083a9b86
commit d53c66973c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/ardour/chan_mapping.cc
View File

@ -22,6 +22,7 @@
#include <stdint.h>
#include <iostream>
#include "ardour/chan_mapping.h"
#include "ardour/types_convert.h"
#include "pbd/i18n.h"
@ -59,10 +60,13 @@ ChanMapping::ChanMapping (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& from_str = (*iter)->property("from")->value();
const string& to_str = (*iter)->property("to")->value();
set(DataType(type_str), atol (from_str.c_str()), atol (to_str.c_str()));
DataType type(DataType::NIL);
uint32_t from;
uint32_t to;
(*iter)->get_property("type", type);
(*iter)->get_property("from", from);
(*iter)->get_property("to", to);
set(type, from, to);
}
}
}
@ -160,9 +164,9 @@ ChanMapping::state(const std::string& name) const
for (Mappings::const_iterator tm = mp.begin(); tm != mp.end(); ++tm) {
for (TypeMapping::const_iterator i = tm->second.begin(); i != tm->second.end(); ++i) {
XMLNode* n = new XMLNode(X_(state_node_name));
n->add_property("type", tm->first.to_string());
n->add_property("from", i->first);
n->add_property("to", i->second);
n->set_property("type", tm->first.to_string());
n->set_property("from", i->first);
n->set_property("to", i->second);
node->add_child_nocopy(*n);
}
}