ardour/livetrax
13
0
Fork 0
Code

Use XMLNode::get/set_property API in ARDOUR::SlavableAutomationControl class

Browse Source
This commit is contained in:
Tim Mayberry 2017-02-22 08:52:56 +10:00
parent 9ec25b307b
commit e6eab345a1
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libs/ardour/slavable_automation_control.cc
View File

@ -21,6 +21,7 @@
#include "pbd/enumwriter.h" #include "pbd/enumwriter.h"
#include "pbd/error.h" #include "pbd/error.h"
#include "pbd/types_convert.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
@ -374,17 +375,15 @@ SlavableAutomationControl::use_saved_master_ratios ()
XMLNodeIterator niter; XMLNodeIterator niter;
for (niter = nlist.begin(); niter != nlist.end(); ++niter) { for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
XMLProperty const * id_prop = (*niter)->property (X_("id")); ID id_val;
if (!id_prop) { bool yn;
if (!(*niter)->get_property (X_("id"), id_val) || !(*niter)->get_property (X_("yn"), yn)) {
continue; continue;
} }
XMLProperty const * yn_prop = (*niter)->property (X_("yn"));
if (!yn_prop) { Masters::iterator mi = _masters.find (id_val);
continue;
}
Masters::iterator mi = _masters.find (ID (id_prop->value()));
if (mi != _masters.end()) { if (mi != _masters.end()) {
mi->second.set_yn (string_is_affirmative (yn_prop->value())); mi->second.set_yn (yn);
} }
} }
@ -416,8 +415,8 @@ SlavableAutomationControl::get_state ()
if (_desc.toggled) { if (_desc.toggled) {
for (Masters::iterator mr = _masters.begin(); mr != _masters.end(); ++mr) { for (Masters::iterator mr = _masters.begin(); mr != _masters.end(); ++mr) {
XMLNode* mnode = new XMLNode (X_("master")); XMLNode* mnode = new XMLNode (X_("master"));
mnode->add_property (X_("id"), mr->second.master()->id().to_s()); mnode->set_property (X_("id"), mr->second.master()->id());
mnode->add_property (X_("yn"), mr->second.yn()); mnode->set_property (X_("yn"), mr->second.yn());
masters_node->add_child_nocopy (*mnode); masters_node->add_child_nocopy (*mnode);
} }
} else { } else {