X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Fgui_object.cc;h=34d32a5b31c3048ada2c768691949e164e758687;hb=3c1bc99df936a2ea1ea11ef6c884b9eecaef5c09;hp=5ea94f9c0cabb27aaf9759d1568b71c4e4dd79c9;hpb=6f858b51d2578eb6f505fb5f2a05c1fefb47816f;p=ardour.git

diff --git a/gtk2_ardour/gui_object.cc b/gtk2_ardour/gui_object.cc
index 5ea94f9c0c..34d32a5b31 100644
--- a/gtk2_ardour/gui_object.cc
+++ b/gtk2_ardour/gui_object.cc
@@ -67,7 +67,7 @@ GUIObjectState::get_or_add_node (const string& id)
 	if (i != object_map.end()) {
 		return i->second;
 	}
-	//assert (get_node (&_state, id) == 0); // XXX
+	//assert (get_node (&_state, id) == 0); // XXX performance penalty due to get_node()
 	XMLNode* child = new XMLNode (X_("Object"));
 	child->add_property (X_("id"), id);
 	_state.add_child_nocopy (*child);
@@ -87,14 +87,15 @@ GUIObjectState::get_string (const string& id, const string& prop_name, bool* emp
 {
 	std::map <std::string, XMLNode*>::const_iterator i = object_map.find (id);
 	if (i == object_map.end()) {
-		//assert (get_node (&_state, id) == 0); // XXX
+		//assert (get_node (&_state, id) == 0); // XXX performance penalty due to get_node()
 		if (empty) {
 			*empty = true;
 		}
 		return string ();
 	}
+	//assert (get_node (&_state, id) == i->second); // XXX performance penalty due to get_node()
 
-	const XMLProperty* p (i->second->property (prop_name));
+	XMLProperty const * p (i->second->property (prop_name));
 	if (!p) {
 		if (empty) {
 			*empty = true;
@@ -130,7 +131,7 @@ GUIObjectState::set_state (const XMLNode& node)
 		if ((*i)->name() != X_("Object")) {
 			continue;
 		}
-		const XMLProperty* prop = (*i)->property (X_("id"));
+		XMLProperty const * prop = (*i)->property (X_("id"));
 		if (!prop) {
 			continue;
 		}