ardour/livetrax
13
0
Fork 0
Code

Gracefully handle templates that lack contents in their description or created_with node.

Browse Source
This commit is contained in:
Ben Loftis 2017-08-30 10:20:29 -05:00
parent 7d88091229
commit 1f6c54a2f0
1 changed files with 39 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
libs/ardour/template_utils.cc
View File

@ -101,26 +101,32 @@ find_session_templates (vector<TemplateInfo>& template_names, bool read_xml)
rti.path = *i;
if (read_xml) {
XMLTree tree;
if (!tree.read (file.c_str())) {
cerr << "Failed to parse Route-template XML file: " << file;
continue;
}
string created_with = _("(unknown)");
XMLNode *pv = tree.root()->child("ProgramVersion");
if (pv != 0) {
pv->get_property (X_("created-with"), created_with);
}
string description = _("No Description");
XMLNode *desc = tree.root()->child("description");
if (desc != 0) {
description = desc->attribute_value();
}
rti.created_with = created_with;
rti.description = description;
XMLNode* root = tree.root();
rti.created_with = _("(unknown)");
try {
XMLNode *pv = root->child("ProgramVersion");
string created_with;
if (pv != 0) {
pv->get_property (X_("created-with"), created_with);
}
rti.created_with = created_with;
} catch ( LIBPBD_API::XMLException &e) {}
rti.description = _("No Description");
try {
XMLNode *desc = root->child("description");
if (desc != 0) {
rti.description = desc->attribute_value();
}
} catch ( LIBPBD_API::XMLException &e) {}
}
template_names.push_back (rti);
@ -144,22 +150,34 @@ find_route_templates (vector<TemplateInfo>& template_names)
XMLTree tree;
if (!tree.read (fullpath.c_str())) {
cerr << "Failed to parse Route-template XML file: " << fullpath;
continue;
}
XMLNode* root = tree.root();
string description = _("No Description");
XMLNode* desc = tree.root()->child ("description");
if (desc) {
description = desc->attribute_value ();
}
TemplateInfo rti;
rti.created_with = _("(unknown)");
try {
XMLNode *pv = root->child("ProgramVersion");
string created_with;
if (pv != 0) {
pv->get_property (X_("created-with"), created_with);
}
rti.created_with = created_with;
} catch ( LIBPBD_API::XMLException &e) {}
rti.description = _("No Description");
try {
XMLNode *desc = root->child("description");
if (desc != 0) {
rti.description = desc->attribute_value();
}
} catch ( LIBPBD_API::XMLException &e) {}
rti.name = IO::name_from_state (*root->children().front());
rti.path = fullpath;
rti.description = description;
template_names.push_back (rti);
}