X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgui_object.cc;h=3f6b79c8c677468b293b38f890331baad475ed63;hb=2eca71e6f151bba08b11b235dff2868999a432fe;hp=c073a3aaf05666922b981d78c5c533e1bd409b03;hpb=17ace643e4edbec1e5bd7b446d039f8c94beef75;p=ardour.git diff --git a/gtk2_ardour/gui_object.cc b/gtk2_ardour/gui_object.cc index c073a3aaf0..3f6b79c8c6 100644 --- a/gtk2_ardour/gui_object.cc +++ b/gtk2_ardour/gui_object.cc @@ -21,7 +21,7 @@ #include #include "gui_object.h" -#include "i18n.h" +#include "pbd/i18n.h" using std::string; @@ -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,12 +87,13 @@ GUIObjectState::get_string (const string& id, const string& prop_name, bool* emp { std::map ::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() XMLProperty const * p (i->second->property (prop_name)); if (!p) {