Switch to unified view

a/src/httpfs.cxx b/src/httpfs.cxx
...
...
51
    "  <serviceId>urn:upnp-org:serviceId:AVTransport</serviceId>"
51
    "  <serviceId>urn:upnp-org:serviceId:AVTransport</serviceId>"
52
    "  <SCPDURL>/upmpd/AVTransport.xml</SCPDURL>"
52
    "  <SCPDURL>/upmpd/AVTransport.xml</SCPDURL>"
53
    "  <controlURL>/ctl/AVTransport</controlURL>"
53
    "  <controlURL>/ctl/AVTransport</controlURL>"
54
    "  <eventSubURL>/evt/AVTransport</eventSubURL>"
54
    "  <eventSubURL>/evt/AVTransport</eventSubURL>"
55
    "</service>"
55
    "</service>"
56
    "<service>"
57
    "  <serviceType>urn:schemas-upnp-org:service:ConnectionManager:1</serviceType>"
58
    "  <serviceId>urn:upnp-org:serviceId:ConnectionManager</serviceId>"
59
    "  <SCPDURL>/upmpd/ConnectionManager.xml</SCPDURL>"
60
    "  <controlURL>/ctl/ConnectionManager</controlURL>"
61
    "  <eventSubURL>/evt/ConnectionManager</eventSubURL>"
62
    "</service>"
56
    );
63
    );
57
64
58
// The description XML document is the first thing downloaded by
65
// The description XML document is the first thing downloaded by
59
// clients and tells them what services we export, and where to find
66
// clients and tells them what services we export, and where to find
60
// them. The base data is in /usr/shared/upmpdcli/description.xml, it
67
// them. The base data is in /usr/shared/upmpdcli/description.xml, it
...
...
63
// OpenHome or other optional services)
70
// OpenHome or other optional services)
64
71
65
// Description of OpenHome services
72
// Description of OpenHome services
66
static string ohDesc(
73
static string ohDesc(
67
    "<service>"
74
    "<service>"
68
    "  <serviceType>urn:av-openhome-org:service:Product:1</serviceType>"
75
    "  <serviceType>urn:av-openhome-org:service:Product:2</serviceType>"
69
    "  <serviceId>urn:av-openhome-org:serviceId:Product</serviceId>"
76
    "  <serviceId>urn:av-openhome-org:serviceId:Product</serviceId>"
70
    "  <SCPDURL>/upmpd/OHProduct.xml</SCPDURL>"
77
    "  <SCPDURL>/upmpd/OHProduct.xml</SCPDURL>"
71
    "  <controlURL>/ctl/OHProduct</controlURL>"
78
    "  <controlURL>/ctl/OHProduct</controlURL>"
72
    "  <eventSubURL>/evt/OHProduct</eventSubURL>"
79
    "  <eventSubURL>/evt/OHProduct</eventSubURL>"
73
    "</service>"
80
    "</service>"