Commit 69117d15 authored by Jens Georg's avatar Jens Georg
Browse files

Rename internal XML utility functions

Prevent clashes with GUPnP when linking statically

https://bugzilla.gnome.org/show_bug.cgi?id=784511
parent 4a89f754
......@@ -57,7 +57,7 @@ get_toplevel_changes (xmlNodePtr current_node,
xmlNodePtr new_node)
{
xmlAttrPtr attribute;
GHashTable *current_attributes = xml_util_get_attributes_map
GHashTable *current_attributes = av_xml_util_get_attributes_map
(current_node);
GList *changes = NULL;
const xmlChar *name = new_node->name;
......@@ -228,9 +228,9 @@ apply_temporary_modification (DocNode *modified,
xmlNodePtr new_node,
XSDData *xsd_data)
{
xmlNodePtr mod_cur_node = xml_util_find_node (modified->node,
current_node);
xmlNodePtr new_node_copy = xml_util_copy_node (new_node);
xmlNodePtr mod_cur_node = av_xml_util_find_node (modified->node,
current_node);
xmlNodePtr new_node_copy = av_xml_util_copy_node (new_node);
if (mod_cur_node == NULL) {
return GUPNP_DIDL_LITE_FRAGMENT_RESULT_UNKNOWN_ERROR;
......@@ -254,12 +254,12 @@ apply_temporary_addition (DocNode *modified,
XSDData *xsd_data)
{
xmlNodePtr mod_sibling;
xmlNodePtr new_node_copy = xml_util_copy_node (new_node);
xmlNodePtr new_node_copy = av_xml_util_copy_node (new_node);
if (sibling->doc == modified->doc)
mod_sibling = sibling;
else
mod_sibling = xml_util_find_node (modified->node, sibling);
mod_sibling = av_xml_util_find_node (modified->node, sibling);
if (mod_sibling == NULL)
return GUPNP_DIDL_LITE_FRAGMENT_RESULT_UNKNOWN_ERROR;
......@@ -283,8 +283,8 @@ apply_temporary_removal (DocNode *modified,
xmlNodePtr current_node,
XSDData *xsd_data)
{
xmlNodePtr mod_cur_node = xml_util_find_node (modified->node,
current_node);
xmlNodePtr mod_cur_node = av_xml_util_find_node (modified->node,
current_node);
if (mod_cur_node == NULL)
return GUPNP_DIDL_LITE_FRAGMENT_RESULT_UNKNOWN_ERROR;
......@@ -561,7 +561,8 @@ new_doc_is_valid_modification (DocNode *modified,
*/
new_node = new_node->next;
current_node = current_node->next;
if (xml_util_node_deep_equal (temp_current_node, temp_new_node))
if (av_xml_util_node_deep_equal (temp_current_node,
temp_new_node))
/* This is just a context, skip the checks. */
continue;
if (xmlStrcmp (temp_current_node->name, temp_new_node->name))
......@@ -666,7 +667,7 @@ is_current_doc_part_of_original_doc (DocNode *original,
if (current_node == NULL)
return TRUE;
this_node = xml_util_find_node (original->node, current_node);
this_node = av_xml_util_find_node (original->node, current_node);
if (this_node == NULL)
return FALSE;
......@@ -674,7 +675,7 @@ is_current_doc_part_of_original_doc (DocNode *original,
for (current_node = current_node->next, this_node = this_node->next;
current_node != NULL && this_node != NULL;
current_node = current_node->next, this_node = this_node->next)
if (!xml_util_node_deep_equal (current_node, this_node))
if (!av_xml_util_node_deep_equal (current_node, this_node))
return FALSE;
return TRUE;
......@@ -825,7 +826,7 @@ fragment_util_apply_modification (xmlNodePtr *node_ptr,
if (node_ptr == NULL || *node_ptr == NULL)
return FALSE;
node_copy = xml_util_copy_node (modified->node);
node_copy = av_xml_util_copy_node (modified->node);
if (node_copy == NULL)
return FALSE;
......
......@@ -119,9 +119,9 @@ gupnp_cds_last_change_parser_parse (GUPnPCDSLastChangeParser *parser,
goto out;
}
state_event = xml_util_get_element ((xmlNode *) doc,
"StateEvent",
NULL);
state_event = av_xml_util_get_element ((xmlNode *) doc,
"StateEvent",
NULL);
if (state_event == NULL) {
g_set_error (error,
G_MARKUP_ERROR,
......@@ -142,22 +142,22 @@ gupnp_cds_last_change_parser_parse (GUPnPCDSLastChangeParser *parser,
entry->ref_count = 1;
entry->event = GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_ADDED;
tmp = xml_util_get_attribute_content (it, "objID");
tmp = av_xml_util_get_attribute_content (it, "objID");
entry->object_id = g_strdup (tmp);
tmp = xml_util_get_attribute_content (it,
"objParentID");
tmp = av_xml_util_get_attribute_content (it,
"objParentID");
entry->parent_id = g_strdup (tmp);
tmp = xml_util_get_attribute_content (it, "objClass");
tmp = av_xml_util_get_attribute_content (it, "objClass");
entry->class = g_strdup (tmp);
entry->update_id = (guint32) xml_util_get_uint_attribute
entry->update_id = (guint32) av_xml_util_get_uint_attribute
(it,
"updateID",
0);
entry->is_subtree_update =
xml_util_get_boolean_attribute
av_xml_util_get_boolean_attribute
(it,
"stUpdate");
} else if (g_ascii_strcasecmp ((const char *) it->name,
......@@ -168,17 +168,17 @@ gupnp_cds_last_change_parser_parse (GUPnPCDSLastChangeParser *parser,
entry->ref_count = 1;
entry->event = GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_MODIFIED;
tmp = xml_util_get_attribute_content (it, "objID");
tmp = av_xml_util_get_attribute_content (it, "objID");
entry->object_id = g_strdup (tmp);
entry->update_id = (guint32) xml_util_get_uint_attribute
entry->update_id = (guint32) av_xml_util_get_uint_attribute
(it,
"updateID",
0);
entry->is_subtree_update =
xml_util_get_boolean_attribute
(it,
"stUpdate");
av_xml_util_get_boolean_attribute
(it,
"stUpdate");
} else if (g_ascii_strcasecmp ((const char *) it->name,
"objDel") == 0) {
const char *tmp;
......@@ -187,17 +187,17 @@ gupnp_cds_last_change_parser_parse (GUPnPCDSLastChangeParser *parser,
entry->ref_count = 1;
entry->event = GUPNP_CDS_LAST_CHANGE_EVENT_OBJECT_REMOVED;
tmp = xml_util_get_attribute_content (it, "objID");
tmp = av_xml_util_get_attribute_content (it, "objID");
entry->object_id = g_strdup (tmp);
entry->update_id = (guint32) xml_util_get_uint_attribute
entry->update_id = (guint32) av_xml_util_get_uint_attribute
(it,
"updateID",
0);
entry->is_subtree_update =
xml_util_get_boolean_attribute
(it,
"stUpdate");
av_xml_util_get_boolean_attribute
(it,
"stUpdate");
} else if (g_ascii_strcasecmp ((const char *) it->name,
"stDone") == 0) {
const char *tmp;
......@@ -206,10 +206,10 @@ gupnp_cds_last_change_parser_parse (GUPnPCDSLastChangeParser *parser,
entry->ref_count = 1;
entry->event = GUPNP_CDS_LAST_CHANGE_EVENT_ST_DONE;
tmp = xml_util_get_attribute_content (it, "objID");
tmp = av_xml_util_get_attribute_content (it, "objID");
entry->object_id = g_strdup (tmp);
entry->update_id = (guint32) xml_util_get_uint_attribute
entry->update_id = (guint32) av_xml_util_get_uint_attribute
(it,
"updateID",
0);
......
......@@ -269,7 +269,7 @@ gupnp_didl_lite_container_get_searchable (GUPnPDIDLLiteContainer *container)
xml_node = gupnp_didl_lite_object_get_xml_node
(GUPNP_DIDL_LITE_OBJECT (container));
return xml_util_get_boolean_attribute (xml_node, "searchable");
return av_xml_util_get_boolean_attribute (xml_node, "searchable");
}
/**
......@@ -292,7 +292,7 @@ gupnp_didl_lite_container_get_child_count (GUPnPDIDLLiteContainer *container)
xml_node = gupnp_didl_lite_object_get_xml_node
(GUPNP_DIDL_LITE_OBJECT (container));
return xml_util_get_int_attribute (xml_node, "childCount", -1);
return av_xml_util_get_int_attribute (xml_node, "childCount", -1);
}
/**
......@@ -315,9 +315,9 @@ gupnp_didl_lite_container_get_container_update_id
xml_node = gupnp_didl_lite_object_get_xml_node
(GUPNP_DIDL_LITE_OBJECT (container));
return xml_util_get_uint_child_element (xml_node,
"containerUpdateID",
0);
return av_xml_util_get_uint_child_element (xml_node,
"containerUpdateID",
0);
}
/**
......@@ -340,8 +340,8 @@ gupnp_didl_lite_container_container_update_id_is_set
xml_node = gupnp_didl_lite_object_get_xml_node
(GUPNP_DIDL_LITE_OBJECT (container));
content = xml_util_get_child_element_content (xml_node,
"containerUpdateID");
content = av_xml_util_get_child_element_content (xml_node,
"containerUpdateID");
return content != NULL;
}
......@@ -365,9 +365,9 @@ gupnp_didl_lite_container_get_total_deleted_child_count
xml_node = gupnp_didl_lite_object_get_xml_node
(GUPNP_DIDL_LITE_OBJECT (container));
return xml_util_get_uint_child_element (xml_node,
"totalDeletedChildCount",
-1);
return av_xml_util_get_uint_child_element (xml_node,
"totalDeletedChildCount",
-1);
}
/**
......@@ -390,8 +390,8 @@ gupnp_didl_lite_container_total_deleted_child_count_is_set
xml_node = gupnp_didl_lite_object_get_xml_node
(GUPNP_DIDL_LITE_OBJECT (container));
content = xml_util_get_child_element_content (xml_node,
"totalDeletedChildCount");
content = av_xml_util_get_child_element_content (xml_node,
"totalDeletedChildCount");
return content != NULL;
}
/**
......@@ -545,7 +545,7 @@ gupnp_didl_lite_container_get_storage_used (GUPnPDIDLLiteContainer *container)
xml_node = gupnp_didl_lite_object_get_xml_node
(GUPNP_DIDL_LITE_OBJECT (container));
str = xml_util_get_child_element_content (xml_node, "storageUsed");
str = av_xml_util_get_child_element_content (xml_node, "storageUsed");
if (str == NULL)
return -1;
......@@ -638,12 +638,12 @@ gupnp_didl_lite_container_set_container_update_id
upnp_ns = gupnp_didl_lite_object_get_upnp_namespace (self_as_object);
str = g_strdup_printf ("%u", update_id);
xml_util_set_child (xml_node,
GUPNP_XML_NAMESPACE_UPNP,
&upnp_ns,
xml_doc->doc,
"containerUpdateID",
str);
av_xml_util_set_child (xml_node,
GUPNP_XML_NAMESPACE_UPNP,
&upnp_ns,
xml_doc->doc,
"containerUpdateID",
str);
g_free (str);
g_object_notify (G_OBJECT (container), "container-update-id");
......@@ -666,7 +666,7 @@ gupnp_didl_lite_container_unset_container_update_id
xml_node = gupnp_didl_lite_object_get_xml_node
(GUPNP_DIDL_LITE_OBJECT (container));
xml_util_unset_child (xml_node, "containerUpdateID");
av_xml_util_unset_child (xml_node, "containerUpdateID");
g_object_notify (G_OBJECT (container), "container-update-id");
}
......@@ -698,12 +698,12 @@ gupnp_didl_lite_container_set_total_deleted_child_count
upnp_ns = gupnp_didl_lite_object_get_upnp_namespace (self_as_object);
str = g_strdup_printf ("%u", count);
xml_util_set_child (xml_node,
GUPNP_XML_NAMESPACE_UPNP,
&upnp_ns,
xml_doc->doc,
"totalDeletedChildCount",
str);
av_xml_util_set_child (xml_node,
GUPNP_XML_NAMESPACE_UPNP,
&upnp_ns,
xml_doc->doc,
"totalDeletedChildCount",
str);
g_free (str);
g_object_notify (G_OBJECT (container), "total-deleted-child-count");
......@@ -726,7 +726,7 @@ gupnp_didl_lite_container_unset_total_deleted_child_count
xml_node = gupnp_didl_lite_object_get_xml_node
(GUPNP_DIDL_LITE_OBJECT (container));
xml_util_unset_child (xml_node, "totalDeletedChildCount");
av_xml_util_unset_child (xml_node, "totalDeletedChildCount");
g_object_notify (G_OBJECT (container), "total-deleted-child-count");
}
......
......@@ -133,7 +133,7 @@ gupnp_didl_lite_contributor_dispose (GObject *object)
priv = GUPNP_DIDL_LITE_CONTRIBUTOR (object)->priv;
g_clear_pointer (&priv->xml_doc, xml_doc_unref);
g_clear_pointer (&priv->xml_doc, av_xml_doc_unref);
object_class = G_OBJECT_CLASS
(gupnp_didl_lite_contributor_parent_class);
......@@ -188,7 +188,7 @@ gupnp_didl_lite_contributor_class_init (GUPnPDIDLLiteContributorClass *klass)
"XMLDoc",
"The reference to XML document"
" containing this contributor.",
xml_doc_get_type (),
av_xml_doc_get_type (),
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_NAME |
......@@ -245,8 +245,8 @@ gupnp_didl_lite_contributor_get_role (GUPnPDIDLLiteContributor *contributor)
g_return_val_if_fail (GUPNP_IS_DIDL_LITE_CONTRIBUTOR (contributor),
NULL);
return xml_util_get_attribute_content (contributor->priv->xml_node,
"role");
return av_xml_util_get_attribute_content (contributor->priv->xml_node,
"role");
}
/**
......
......@@ -149,7 +149,7 @@ gupnp_didl_lite_create_class_dispose (GObject *object)
priv = GUPNP_DIDL_LITE_CREATE_CLASS (object)->priv;
g_clear_pointer (&priv->xml_doc, xml_doc_unref);
g_clear_pointer (&priv->xml_doc, av_xml_doc_unref);
object_class = G_OBJECT_CLASS
(gupnp_didl_lite_create_class_parent_class);
......@@ -206,7 +206,7 @@ gupnp_didl_lite_create_class_class_init (GUPnPDIDLLiteCreateClassClass *klass)
"XMLDoc",
"The reference to XML document"
" containing this object.",
xml_doc_get_type (),
av_xml_doc_get_type (),
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_NAME |
......@@ -329,8 +329,8 @@ gupnp_didl_lite_create_class_get_include_derived
g_return_val_if_fail (GUPNP_IS_DIDL_LITE_CREATE_CLASS (create_class),
FALSE);
return xml_util_get_boolean_attribute (create_class->priv->xml_node,
"includeDerived");
return av_xml_util_get_boolean_attribute (create_class->priv->xml_node,
"includeDerived");
}
/**
......@@ -375,8 +375,8 @@ gupnp_didl_lite_create_class_get_friendly_name
{
g_return_val_if_fail (GUPNP_IS_DIDL_LITE_CREATE_CLASS (create_class),
NULL);
return xml_util_get_attribute_content (create_class->priv->xml_node,
"name");
return av_xml_util_get_attribute_content (create_class->priv->xml_node,
"name");
}
/**
......
......@@ -157,7 +157,7 @@ gupnp_didl_lite_descriptor_dispose (GObject *object)
priv = GUPNP_DIDL_LITE_DESCRIPTOR (object)->priv;
g_clear_pointer (&priv->xml_doc, xml_doc_unref);
g_clear_pointer (&priv->xml_doc, av_xml_doc_unref);
object_class = G_OBJECT_CLASS (gupnp_didl_lite_descriptor_parent_class);
object_class->dispose (object);
......@@ -211,7 +211,7 @@ gupnp_didl_lite_descriptor_class_init (GUPnPDIDLLiteDescriptorClass *klass)
"XMLDoc",
"The reference to XML document"
" containing this object.",
xml_doc_get_type (),
av_xml_doc_get_type (),
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_NAME |
......@@ -364,8 +364,8 @@ gupnp_didl_lite_descriptor_get_id (GUPnPDIDLLiteDescriptor *descriptor)
{
g_return_val_if_fail (GUPNP_IS_DIDL_LITE_DESCRIPTOR (descriptor), NULL);
return xml_util_get_attribute_content (descriptor->priv->xml_node,
"id");
return av_xml_util_get_attribute_content (descriptor->priv->xml_node,
"id");
}
/**
......@@ -382,8 +382,8 @@ gupnp_didl_lite_descriptor_get_metadata_type
{
g_return_val_if_fail (GUPNP_IS_DIDL_LITE_DESCRIPTOR (descriptor), NULL);
return xml_util_get_attribute_content (descriptor->priv->xml_node,
"type");
return av_xml_util_get_attribute_content (descriptor->priv->xml_node,
"type");
}
/**
......@@ -399,8 +399,8 @@ gupnp_didl_lite_descriptor_get_name_space (GUPnPDIDLLiteDescriptor *descriptor)
{
g_return_val_if_fail (GUPNP_IS_DIDL_LITE_DESCRIPTOR (descriptor), NULL);
return xml_util_get_attribute_content (descriptor->priv->xml_node,
"nameSpace");
return av_xml_util_get_attribute_content (descriptor->priv->xml_node,
"nameSpace");
}
/**
......
......@@ -167,7 +167,7 @@ gupnp_didl_lite_item_get_ref_id (GUPnPDIDLLiteItem *item)
xml_node = gupnp_didl_lite_object_get_xml_node
(GUPNP_DIDL_LITE_OBJECT (item));
return xml_util_get_attribute_content (xml_node, "refID");
return av_xml_util_get_attribute_content (xml_node, "refID");
}
/**
......@@ -218,17 +218,17 @@ gupnp_didl_lite_item_set_lifetime (GUPnPDIDLLiteItem *item,
g_object_get (G_OBJECT (object), "xml-doc", &doc, NULL);
if (lifetime < 0)
xml_util_unset_child (node, "lifetime");
av_xml_util_unset_child (node, "lifetime");
else {
char *str;
str = seconds_to_time (lifetime);
xml_util_set_child (node,
GUPNP_XML_NAMESPACE_DLNA,
&ns,
doc->doc,
"lifetime",
str);
av_xml_util_set_child (node,
GUPNP_XML_NAMESPACE_DLNA,
&ns,
doc->doc,
"lifetime",
str);
g_free (str);
}
......@@ -254,7 +254,8 @@ gupnp_didl_lite_item_get_lifetime (GUPnPDIDLLiteItem *item)
object = GUPNP_DIDL_LITE_OBJECT (item);
node = gupnp_didl_lite_object_get_xml_node (object);
lifetime_str = xml_util_get_child_element_content (node, "lifetime");
lifetime_str = av_xml_util_get_child_element_content (node,
"lifetime");
lifetime = seconds_from_time (lifetime_str);
return lifetime;
......
This diff is collapsed.
......@@ -52,7 +52,7 @@ verify_didl_attributes (xmlNode *node)
{
const char *content;
content = xml_util_get_child_element_content (node, "date");
content = av_xml_util_get_child_element_content (node, "date");
if (content) {
/* try to roughly verify the passed date with ^\d{4}-\d{2}-\d{2} */
char *ptr = (char *) content;
......@@ -73,9 +73,9 @@ verify_didl_attributes (xmlNode *node)
}
}
if (xml_util_get_attribute_content (node, "restricted") != NULL) {
return xml_util_verify_attribute_is_boolean (node,
"restricted");
if (av_xml_util_get_attribute_content (node, "restricted") != NULL) {
return av_xml_util_verify_attribute_is_boolean (node,
"restricted");
}
return TRUE;
......@@ -251,9 +251,9 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser,
}
/* Get a pointer to root element */
element = xml_util_get_element ((xmlNode *) doc,
"DIDL-Lite",
NULL);
element = av_xml_util_get_element ((xmlNode *) doc,
"DIDL-Lite",
NULL);
if (element == NULL) {
g_set_error (error,
G_MARKUP_ERROR,
......@@ -277,26 +277,30 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser,
}
/* Create namespaces if they don't exist */
upnp_ns = xml_util_lookup_namespace (doc, GUPNP_XML_NAMESPACE_UPNP);
upnp_ns = av_xml_util_lookup_namespace (doc, GUPNP_XML_NAMESPACE_UPNP);
if (! upnp_ns)
upnp_ns = xml_util_create_namespace (xmlDocGetRootElement (doc),
GUPNP_XML_NAMESPACE_UPNP);
upnp_ns = av_xml_util_create_namespace
(xmlDocGetRootElement (doc),
GUPNP_XML_NAMESPACE_UPNP);
dc_ns = xml_util_lookup_namespace (doc, GUPNP_XML_NAMESPACE_DC);
dc_ns = av_xml_util_lookup_namespace (doc, GUPNP_XML_NAMESPACE_DC);
if (! dc_ns)
dc_ns = xml_util_create_namespace (xmlDocGetRootElement (doc),
GUPNP_XML_NAMESPACE_DC);
dlna_ns = xml_util_lookup_namespace (doc, GUPNP_XML_NAMESPACE_DLNA);
dc_ns = av_xml_util_create_namespace
(xmlDocGetRootElement (doc),
GUPNP_XML_NAMESPACE_DC);
dlna_ns = av_xml_util_lookup_namespace (doc, GUPNP_XML_NAMESPACE_DLNA);
if (! dlna_ns)
dlna_ns = xml_util_create_namespace (xmlDocGetRootElement (doc),
GUPNP_XML_NAMESPACE_DLNA);
dlna_ns = av_xml_util_create_namespace
(xmlDocGetRootElement (doc),
GUPNP_XML_NAMESPACE_DLNA);
pv_ns = xml_util_lookup_namespace (doc, GUPNP_XML_NAMESPACE_PV);
pv_ns = av_xml_util_lookup_namespace (doc, GUPNP_XML_NAMESPACE_PV);
if (! pv_ns)
pv_ns = xml_util_create_namespace (xmlDocGetRootElement (doc),
GUPNP_XML_NAMESPACE_PV);
pv_ns = av_xml_util_create_namespace
(xmlDocGetRootElement (doc),
GUPNP_XML_NAMESPACE_PV);
xml_doc = xml_doc_new (doc);
xml_doc = av_xml_doc_new (doc);
result = parse_elements (parser,
element,
......@@ -307,7 +311,7 @@ gupnp_didl_lite_parser_parse_didl_recursive (GUPnPDIDLLiteParser *parser,
pv_ns,
recursive,
error);
xml_doc_unref (xml_doc);
av_xml_doc_unref (xml_doc);
return result;
}
......
......@@ -93,8 +93,9 @@ get_resolution_info (GUPnPDIDLLiteResource *resource,
const char *resolution;
char **tokens;
resolution = xml_util_get_attribute_content (resource->priv->xml_node,
"resolution");
resolution = av_xml_util_get_attribute_content
(resource->priv->xml_node,
"resolution");
if (resolution == NULL)
return;
......@@ -386,7 +387,7 @@ gupnp_didl_lite_resource_dispose (GObject *object)
priv = GUPNP_DIDL_LITE_RESOURCE (object)->priv;
g_clear_pointer (&priv->xml_doc, xml_doc_unref);
g_clear_pointer (&priv->xml_doc, av_xml_doc_unref);
if (priv->protocol_info != NULL) {
g_object_unref (priv->protocol_info);
......@@ -444,7 +445,7 @@ gupnp_didl_lite_resource_class_init (GUPnPDIDLLiteResourceClass *klass)
"XMLDoc",
"The reference to XML document"
" containing this object.",
xml_doc_get_type (),
av_xml_doc_get_type (),
G_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_NAME |
......@@ -947,8 +948,8 @@ gupnp_didl_lite_resource_get_import_uri (GUPnPDIDLLiteResource *resource)
{
g_return_val_if_fail (GUPNP_IS_DIDL_LITE_RESOURCE (resource), NULL);
return xml_util_get_attribute_content (resource->priv->xml_node,
"importUri");
return av_xml_util_get_attribute_content (resource->priv->xml_node,
"importUri");
}
/**
......@@ -972,7 +973,7 @@ gupnp_didl_lite_resource_get_protocol_info (GUPnPDIDLLiteResource *resource)
if (resource->priv->protocol_info != NULL)
return resource->priv->protocol_info;
protocol_info = xml_util_get_attribute_content
protocol_info = av_xml_util_get_attribute_content
(resource->priv->xml_node,
"protocolInfo");
if (protocol_info == NULL)
......@@ -1020,9 +1021,9 @@ gupnp_didl_lite_resource_get_size64 (GUPnPDIDLLiteResource *resource)
{
g_return_val_if_fail (GUPNP_IS_DIDL_LITE_RESOURCE (resource), -1);
return xml_util_get_int64_attribute (resource->priv->xml_node,
"size",
-1);
return av_xml_util_get_int64_attribute (resource->priv->xml_node,