diff options
Diffstat (limited to 'httptnt')
| -rw-r--r-- | httptnt/cds_scpd.ecpp | 279 | ||||
| -rw-r--r-- | httptnt/deviceDescription.ecpp | 23 |
2 files changed, 161 insertions, 141 deletions
diff --git a/httptnt/cds_scpd.ecpp b/httptnt/cds_scpd.ecpp index 7a2c72f..97b3b45 100644 --- a/httptnt/cds_scpd.ecpp +++ b/httptnt/cds_scpd.ecpp @@ -8,137 +8,12 @@ It contains the service description for the connection manager of the media serv #> <{ reply.setContentType("application/xml"); }> <scpd xmlns="urn:schemas-upnp-org:service-1-0"> - <serviceStateTable> - <stateVariable> <Optional/> - <name>TransferIDs</name> - <sendEventsAttribute>yes</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_ObjectID</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_Result</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> <Optional/> - <name>A_ARG_TYPE_SearchCriteria</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_BrowseFlag</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>BrowseMetadata</allowedValue> - <allowedValue>BrowseDirectChildren</allowedValue> - </allowedValueList> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_Filter</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_SortCriteria</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_Index</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_Count</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_UpdateID</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable> <Optional/> - <name>A_ARG_TYPE_TransferID</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable> <Optional/> - <name>A_ARG_TYPE_TransferStatus</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>COMPLETED</allowedValue> - <allowedValue>ERROR</allowedValue> - <allowedValue>IN_PROGRESS</allowedValue> - <allowedValue>STOPPED</allowedValue> - </allowedValueList> - </stateVariable> - <stateVariable> <Optional/> - <name>A_ARG_TYPE_TransferLength</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> <Optional/> - <name>A_ARG_TYPE_TransferTotal</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> <Optional/> - <name>A_ARG_TYPE_TagValueList</name> <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> <Optional/> - <name>A_ARG_TYPE_URI</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>uri</dataType> - </stateVariable> - <stateVariable> - <name>SearchCapabilities</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>SortCapabilities</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>SystemUpdateID</name> - <sendEventsAttribute>yes</sendEventsAttribute> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable> <Optional/> - <name>ContainerUpdateIDs</name> -<sendEventsAttribute>yes</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - </serviceStateTable> - <actionList> - <action> - <name>GetSearchCapabilities</name> - <argumentList> - <argument> - <name>SearchCaps</name> - <direction>out</direction> - <relatedStateVariable>SearchCapabilities </relatedStateVariable> - </argument> - </argumentList> - </action> - <action> - <name>GetSortCapabilities</name> - <argumentList> - <argument> - <name>SortCaps</name> - <direction>out</direction> - <relatedStateVariable>SortCapabilities</relatedStateVariable> - </argument> - </argumentList> - </action> - <action> - <name>GetSystemUpdateID</name> - <argumentList> - <argument> - <name>Id</name> - <direction>out</direction> - <relatedStateVariable>SystemUpdateID</relatedStateVariable> - </argument> - </argumentList> - </action> - <action> + <specVersion> + <major>1</major> + <minor>0</minor> + </specVersion> + <actionList> +<action> <name>Browse</name> <argumentList> <argument> @@ -193,6 +68,36 @@ It contains the service description for the connection manager of the media serv </argument> </argumentList> </action> + <action> + <name>GetSearchCapabilities</name> + <argumentList> + <argument> + <name>SearchCaps</name> + <direction>out</direction> + <relatedStateVariable>SearchCapabilities</relatedStateVariable> + </argument> + </argumentList> + </action> + <action> + <name>GetSortCapabilities</name> + <argumentList> + <argument> + <name>SortCaps</name> + <direction>out</direction> + <relatedStateVariable>SortCapabilities</relatedStateVariable> + </argument> + </argumentList> + </action> + <action> + <name>GetSystemUpdateID</name> + <argumentList> + <argument> + <name>Id</name> + <direction>out</direction> + <relatedStateVariable>SystemUpdateID</relatedStateVariable> + </argument> + </argumentList> + </action> <action> <name>Search</name> <argumentList> @@ -249,4 +154,116 @@ It contains the service description for the connection manager of the media serv </argumentList> </action> </actionList> + <serviceStateTable> + <stateVariable> + <name>TransferIDs</name> + <sendEventsAttribute>yes</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_ObjectID</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_Result</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_SearchCriteria</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_BrowseFlag</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + <allowedValueList> + <allowedValue>BrowseMetadata</allowedValue> + <allowedValue>BrowseDirectChildren</allowedValue> + </allowedValueList> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_Filter</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_SortCriteria</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_Index</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>ui4</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_Count</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>ui4</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_UpdateID</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>ui4</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_TransferID</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>ui4</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_TransferStatus</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + <allowedValueList> + <allowedValue>COMPLETED</allowedValue> + <allowedValue>ERROR</allowedValue> + <allowedValue>IN_PROGRESS</allowedValue> + <allowedValue>STOPPED</allowedValue> + </allowedValueList> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_TransferLength</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_TransferTotal</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_TagValueList</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + <stateVariable> + <name>A_ARG_TYPE_URI</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>uri</dataType> + </stateVariable> + <stateVariable> + <name>SearchCapabilities</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + <stateVariable> + <name>SortCapabilities</name> + <sendEventsAttribute>no</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + <stateVariable> + <name>SystemUpdateID</name> + <sendEventsAttribute>yes</sendEventsAttribute> + <dataType>ui4</dataType> + </stateVariable> + <stateVariable> + <name>ContainerUpdateIDs</name> + <sendEventsAttribute>yes</sendEventsAttribute> + <dataType>string</dataType> + </stateVariable> + </serviceStateTable> </scpd> diff --git a/httptnt/deviceDescription.ecpp b/httptnt/deviceDescription.ecpp index 9646d30..832df86 100644 --- a/httptnt/deviceDescription.ecpp +++ b/httptnt/deviceDescription.ecpp @@ -17,7 +17,7 @@ It contains the device and service descriptions of the media server. using namespace upnp; </%pre> -<{ +<%cpp> upnp::cMediaServer* server = cMediaServer::GetInstance(); const upnp::cWebserver& webserver = server->GetWebserver(); @@ -31,7 +31,7 @@ using namespace upnp; reply.setContentType("application/xml"); -}> +</%cpp> <root xmlns="urn:schemas-upnp-org:device-1-0" xmlns:dlna="urn:schemas-dlna-org:device-1-0"> <specVersion> <major>1</major> @@ -51,13 +51,12 @@ using namespace upnp; <presentationURL><$ presentationUrl $></presentationURL> <dlna:X_DLNADOC>DMS-1.50</dlna:X_DLNADOC> <serviceList> -<{ +<%cpp> const cMediaServer::serviceMap& services = server->GetServices(); for(cMediaServer::serviceMap::const_iterator it = services.begin(); it != services.end(); ++it){ const cUPnPService::Description& serviceDescription = (*it).second->GetServiceDescription(); -}> - +</%cpp> <service> <serviceType><$ serviceDescription.serviceType $></serviceType> <serviceId><$ serviceDescription.serviceID $></serviceId> @@ -65,14 +64,16 @@ using namespace upnp; <controlURL><$ controlUrl $><$ serviceDescription.controlDescriptor $></controlURL> <eventSubURL><$ controlUrl $><$ serviceDescription.eventSubscriberDescriptor $></eventSubURL> </service> -% }; +<%cpp> + }; +</%cpp> </serviceList> <iconList> -<{ +<%cpp> const cMediaServer::iconList& icons = server->GetServerIcons(); for(cMediaServer::iconList::const_iterator it = icons.begin(); it != icons.end(); ++it){ -}> +</%cpp> <icon> <mimetype><$ (*it).profile.mime $></mimetype> <width><$ (*it).profile.width $></width> @@ -80,7 +81,9 @@ using namespace upnp; <depth><$ (int)(*it).profile.bitDepth $></depth> <url><$ staticContentUrl $><$ (*it).filename $></url> </icon> -% }; +<%cpp> + }; +</%cpp> </iconList> </device> -</root>
\ No newline at end of file +</root> |