storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete PNPX support.

Browse Source 
AFAICT this has been abandoned by Microsoft.
This commit is contained in:
Justin Maggard
2016-04-21 14:38:45 -07:00
parent 02b6085380
commit 1f46b53030
6 changed files with 15 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
upnpdescgen.c
View File

@@ -115,29 +115,17 @@ static const char xmlver[] =
static const char root_service[] =
"scpd xmlns=\"urn:schemas-upnp-org:service-1-0\"";
static const char root_device[] =
"root xmlns=\"urn:schemas-upnp-org:device-1-0\""
#if PNPX
" xmlns:pnpx=\"http://schemas.microsoft.com/windows/pnpx/2005/11\""
" xmlns:df=\"http://schemas.microsoft.com/windows/2008/09/devicefoundation\""
#endif
;
"root xmlns=\"urn:schemas-upnp-org:device-1-0\"";
/* root Description of the UPnP Device */
static const struct XMLElt rootDesc[] =
{
{root_device, INITHELPER(1,2)},
{"specVersion", INITHELPER(3,2)},
{"device", INITHELPER(5,(14+PNPX))},
{"device", INITHELPER(5,(14))},
{"/major", "1"},
{"/minor", "0"},
{"/deviceType", "urn:schemas-upnp-org:device:MediaServer:1"},
#if PNPX == 5
{"/pnpx:X_hardwareId", pnpx_hwid},
{"/pnpx:X_compatibleId", "MS_DigitalMediaDeviceClass_DMS_V001"},
{"/pnpx:X_deviceCategory", "MediaDevices"},
{"/df:X_deviceCategory", "Multimedia.DMS"},
{"/microsoft:magicPacketWakeSupported xmlns:microsoft=\"urn:schemas-microsoft-com:WMPNSS-1-0\"", "0"},
#endif
{"/friendlyName", friendly_name}, /* required */
{"/manufacturer", ROOTDEV_MANUFACTURER}, /* required */
{"/manufacturerURL", ROOTDEV_MANUFACTURERURL}, /* optional */
@@ -149,12 +137,12 @@ static const struct XMLElt rootDesc[] =
{"/UDN", uuidvalue}, /* required */
{"/dlna:X_DLNADOC xmlns:dlna=\"urn:schemas-dlna-org:device-1-0\"", "DMS-1.50"},
{"/presentationURL", presentationurl}, /* recommended */
{"iconList", INITHELPER((19+PNPX),4)},
{"serviceList", INITHELPER((43+PNPX),3)},
{"icon", INITHELPER((23+PNPX),5)},
{"icon", INITHELPER((28+PNPX),5)},
{"icon", INITHELPER((33+PNPX),5)},
{"icon", INITHELPER((38+PNPX),5)},
{"iconList", INITHELPER((19),4)},
{"serviceList", INITHELPER((43),3)},
{"icon", INITHELPER((23),5)},
{"icon", INITHELPER((28),5)},
{"icon", INITHELPER((33),5)},
{"icon", INITHELPER((38),5)},
{"/mimetype", "image/png"},
{"/width", "48"},
{"/height", "48"},
@@ -175,9 +163,9 @@ static const struct XMLElt rootDesc[] =
{"/height", "120"},
{"/depth", "24"},
{"/url", "/icons/lrg.jpg"},
{"service", INITHELPER((46+PNPX),5)},
{"service", INITHELPER((51+PNPX),5)},
{"service", INITHELPER((56+PNPX),5)},
{"service", INITHELPER((46),5)},
{"service", INITHELPER((51),5)},
{"service", INITHELPER((56),5)},
{"/serviceType", "urn:schemas-upnp-org:service:ContentDirectory:1"},
{"/serviceId", "urn:upnp-org:serviceId:ContentDirectory"},
{"/controlURL", CONTENTDIRECTORY_CONTROLURL},
@@ -584,10 +572,10 @@ genRootDescSamsung(int * len)
memcpy(str, xmlver, *len + 1);
/* Replace the optional modelURL and manufacturerURL fields with Samsung foo */
memcpy(&samsungRootDesc, &rootDesc, sizeof(rootDesc));
samsungRootDesc[8+PNPX].eltname = "/sec:ProductCap";
samsungRootDesc[8+PNPX].data = "smi,DCM10,getMediaInfo.sec,getCaptionInfo.sec";
samsungRootDesc[12+PNPX].eltname = "/sec:X_ProductCap";
samsungRootDesc[12+PNPX].data = "smi,DCM10,getMediaInfo.sec,getCaptionInfo.sec";
samsungRootDesc[8].eltname = "/sec:ProductCap";
samsungRootDesc[8].data = "smi,DCM10,getMediaInfo.sec,getCaptionInfo.sec";
samsungRootDesc[12].eltname = "/sec:X_ProductCap";
samsungRootDesc[12].data = "smi,DCM10,getMediaInfo.sec,getCaptionInfo.sec";
str = genXML(str, len, &tmplen, samsungRootDesc);
str[*len] = '\0';
return str;