From 2ea5962af2a389277703c6eebc2160cf52302468 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 24 Jun 2015 13:46:07 -0400 Subject: rationalize save/restore of control surface "feedback" property --- libs/surfaces/osc/osc.cc | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'libs/surfaces/osc/osc.cc') diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 5878b34d80..727485d83c 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -1090,25 +1090,14 @@ OSC::route_plugin_parameter_print (int rid, int piid, int par) XMLNode& OSC::get_state () { - XMLNode& node (ControlProtocol::get_state()); - - node.add_property (X_("feedback"), _send_route_changes ? "1" : "0"); - return node; + return ControlProtocol::get_state(); } int -OSC::set_state (const XMLNode& node, int /*version*/) +OSC::set_state (const XMLNode& node, int version) { - const XMLProperty* prop = node.property (X_("feedback")); - - if (prop) { - if (PBD::string_is_affirmative (prop->value())) { - _send_route_changes = true; - } else { - _send_route_changes = false; - } - } else { - /* leave it alone */ + if (ControlProtocol::set_state (node, version)) { + return -1; } return 0; -- cgit v1.2.3