ardour/livetrax
13
0
Fork 0
Code

Use XMLNode::get/set_property API in ARDOUR::Delivery

Browse Source
This commit is contained in:
Tim Mayberry 2016-08-27 22:53:51 +10:00
parent 775328f3dc
commit 7994525c5c
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/ardour/delivery.cc
View File

@ -20,7 +20,7 @@
#include <algorithm> #include <algorithm>
#include "pbd/enumwriter.h" #include "pbd/enumwriter.h"
#include "pbd/convert.h" #include "pbd/enum_convert.h"
#include "ardour/amp.h" #include "ardour/amp.h"
#include "ardour/audioengine.h" #include "ardour/audioengine.h"
@ -36,6 +36,10 @@
#include "pbd/i18n.h" #include "pbd/i18n.h"
namespace PBD {
DEFINE_ENUM_CONVERT(ARDOUR::Delivery::Role);
}
namespace ARDOUR { class Panner; } namespace ARDOUR { class Panner; }
using namespace std; using namespace std;
@ -356,14 +360,14 @@ Delivery::state (bool full_state)
XMLNode& node (IOProcessor::state (full_state)); XMLNode& node (IOProcessor::state (full_state));
if (_role & Main) { if (_role & Main) {
node.add_property("type", "main-outs"); node.set_property("type", "main-outs");
} else if (_role & Listen) { } else if (_role & Listen) {
node.add_property("type", "listen"); node.set_property("type", "listen");
} else { } else {
node.add_property("type", "delivery"); node.set_property("type", "delivery");
} }
node.add_property("role", enum_2_string(_role)); node.set_property("role", _role);
if (_panshell) { if (_panshell) {
node.add_child_nocopy (_panshell->get_state ()); node.add_child_nocopy (_panshell->get_state ());
@ -378,14 +382,11 @@ Delivery::state (bool full_state)
int int
Delivery::set_state (const XMLNode& node, int version) Delivery::set_state (const XMLNode& node, int version)
{ {
XMLProperty const * prop;
if (IOProcessor::set_state (node, version)) { if (IOProcessor::set_state (node, version)) {
return -1; return -1;
} }
if ((prop = node.property ("role")) != 0) { if (node.get_property ("role", _role)) {
_role = Role (string_2_enum (prop->value(), _role));
// std::cerr << this << ' ' << _name << " set role to " << enum_2_string (_role) << std::endl; // std::cerr << this << ' ' << _name << " set role to " << enum_2_string (_role) << std::endl;
} else { } else {
// std::cerr << this << ' ' << _name << " NO ROLE INFO\n"; // std::cerr << this << ' ' << _name << " NO ROLE INFO\n";