Skip to content

V
vlc-2-2
Commit 22dee200 authored by Alexandre Pereira Nunes's avatar Alexandre Pereira Nunes Committed by Mirsal Ennaime
Browse files
Options

upnp: Support Twonkymedia's DLNA server subtitles

parent ea660fce
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
modules/services_discovery/upnp.cpp
View file @ 22dee200
...@@ -822,7 +822,8 @@ bool MediaServer::_fetchContents( Container* p_parent, int i_offset ) ...@@ -822,7 +822,8 @@ bool MediaServer::_fetchContents( Container* p_parent, int i_offset )
IXML_Document* p_response = _browseAction( p_parent->getObjectID(), IXML_Document* p_response = _browseAction( p_parent->getObjectID(),
"BrowseDirectChildren", "BrowseDirectChildren",
"id,dc:title,res," /* Filter */ "id,dc:title,res," /* Filter */
"sec:CaptionInfo,sec:CaptionInfoEx", "sec:CaptionInfo,sec:CaptionInfoEx,"
"pv:subtitlefile",
psz_starting_index, /* StartingIndex */ psz_starting_index, /* StartingIndex */
"0", /* RequestedCount */ "0", /* RequestedCount */
"" /* SortCriteria */ "" /* SortCriteria */
...@@ -912,6 +913,10 @@ bool MediaServer::_fetchContents( Container* p_parent, int i_offset ) ...@@ -912,6 +913,10 @@ bool MediaServer::_fetchContents( Container* p_parent, int i_offset )
psz_subtitles = xml_getChildElementValue( itemElement, psz_subtitles = xml_getChildElementValue( itemElement,
"sec:CaptionInfoEx" ); "sec:CaptionInfoEx" );
if ( !psz_subtitles )
psz_subtitles = xml_getChildElementValue( itemElement,
"pv:subtitlefile" );
/* Try to extract all resources in DIDL */ /* Try to extract all resources in DIDL */
IXML_NodeList* p_resource_list = ixmlDocument_getElementsByTagName( (IXML_Document*) itemElement, "res" ); IXML_NodeList* p_resource_list = ixmlDocument_getElementsByTagName( (IXML_Document*) itemElement, "res" );
if ( p_resource_list ) if ( p_resource_list )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment