From 5cd88fa0509cecc19263b5d4a0be8ebb2fa0518d Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Mon, 29 Aug 2016 18:50:04 +1000 Subject: Use XMLNode::get/set_property API in MeterBridge class --- gtk2_ardour/meterbridge.cc | 54 ++++++++++++---------------------------------- 1 file changed, 14 insertions(+), 40 deletions(-) (limited to 'gtk2_ardour/meterbridge.cc') diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc index 65438c414e..20e338c369 100644 --- a/gtk2_ardour/meterbridge.cc +++ b/gtk2_ardour/meterbridge.cc @@ -486,7 +486,6 @@ Meterbridge::session_going_away () int Meterbridge::set_state (const XMLNode& node) { - XMLProperty const * prop; XMLNode* geometry; m_width = default_width; @@ -496,43 +495,23 @@ Meterbridge::set_state (const XMLNode& node) if ((geometry = find_named_node (node, "geometry")) != 0) { - XMLProperty const * prop; - - if ((prop = geometry->property("x_size")) == 0) { - prop = geometry->property ("x-size"); - } - if (prop) { - m_width = atoi(prop->value()); + if (!geometry->get_property ("x_size", m_width)) { + geometry->get_property ("x-size", m_width); } - if ((prop = geometry->property("y_size")) == 0) { - prop = geometry->property ("y-size"); + if (!geometry->get_property("y_size", m_height)) { + geometry->get_property ("y-size", m_height); } - if (prop) { - m_height = atoi(prop->value()); + if (!geometry->get_property ("x_pos", m_root_x)) { + geometry->get_property ("x-pos", m_root_x); } - - if ((prop = geometry->property ("x_pos")) == 0) { - prop = geometry->property ("x-pos"); - } - if (prop) { - m_root_x = atoi (prop->value()); - - } - if ((prop = geometry->property ("y_pos")) == 0) { - prop = geometry->property ("y-pos"); - } - if (prop) { - m_root_y = atoi (prop->value()); + if (!geometry->get_property ("y_pos", m_root_y)) { + geometry->get_property ("y-pos", m_root_y); } } set_window_pos_and_size (); - if ((prop = node.property ("show-meterbridge"))) { - if (string_is_affirmative (prop->value())) { - _visible = true; - } - } + node.get_property ("show-meterbridge", _visible); return 0; } @@ -540,7 +519,6 @@ Meterbridge::set_state (const XMLNode& node) XMLNode& Meterbridge::get_state (void) { - char buf[32]; XMLNode* node = new XMLNode ("Meterbridge"); if (is_realized() && _visible) { @@ -548,17 +526,13 @@ Meterbridge::get_state (void) } XMLNode* geometry = new XMLNode ("geometry"); - snprintf(buf, sizeof(buf), "%d", m_width); - geometry->add_property(X_("x_size"), string(buf)); - snprintf(buf, sizeof(buf), "%d", m_height); - geometry->add_property(X_("y_size"), string(buf)); - snprintf(buf, sizeof(buf), "%d", m_root_x); - geometry->add_property(X_("x_pos"), string(buf)); - snprintf(buf, sizeof(buf), "%d", m_root_y); - geometry->add_property(X_("y_pos"), string(buf)); + geometry->set_property(X_("x_size"), m_width); + geometry->set_property(X_("y_size"), m_height); + geometry->set_property(X_("x_pos"), m_root_x); + geometry->set_property(X_("y_pos"), m_root_y); node->add_child_nocopy (*geometry); - node->add_property ("show-meterbridge", _visible ? "yes" : "no"); + node->set_property ("show-meterbridge", _visible); return *node; } -- cgit v1.2.3