diff options
Diffstat (limited to 'httptnt')
| -rw-r--r-- | httptnt/cds_scpd.ecpp | 382 | ||||
| -rw-r--r-- | httptnt/cds_scpd.o | bin | 206016 -> 210528 bytes | |||
| -rw-r--r-- | httptnt/deviceDescription.ecpp | 7 | ||||
| -rw-r--r-- | httptnt/deviceDescription.o | bin | 295912 -> 295880 bytes |
4 files changed, 244 insertions, 145 deletions
diff --git a/httptnt/cds_scpd.ecpp b/httptnt/cds_scpd.ecpp index 73f0baf..7a2c72f 100644 --- a/httptnt/cds_scpd.ecpp +++ b/httptnt/cds_scpd.ecpp @@ -8,145 +8,245 @@ 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"> - <specVersion> - <major>1</major> - <minor>0</minor> - </specVersion> - <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> - <name>Browse</name> - <argumentList> - <argument> - <name>ObjectID</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable> - </argument> - <argument> - <name>BrowseFlag</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_BrowseFlag</relatedStateVariable> - </argument> - <argument> - <name>Filter</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_Filter</relatedStateVariable> - </argument> - <argument> - <name>StartingIndex</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_Index</relatedStateVariable> - </argument> - <argument> - <name>RequestedCount</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> - </argument> - <argument> - <name>SortCriteria</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_SortCriteria</relatedStateVariable> - </argument> - <argument> - <name>Result</name> - <direction>out</direction> - <relatedStateVariable>A_ARG_TYPE_Result</relatedStateVariable> - </argument> - <argument> - <name>NumberReturned</name> - <direction>out</direction> - <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> - </argument> - <argument> - <name>TotalMatches</name> - <direction>out</direction> - <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> - </argument> - <argument> - <name>UpdateID</name> - <direction>out</direction> - <relatedStateVariable>A_ARG_TYPE_UpdateID</relatedStateVariable> - </argument> - </argumentList> - </action> - </actionList> - <serviceStateTable> - <stateVariable sendEvents="no"> - <name>A_ARG_TYPE_ObjectID</name> - <dataType>string</dataType> - </stateVariable> - <stateVariable sendEvents="no"> - <name>A_ARG_TYPE_Result</name> - <dataType>string</dataType> - </stateVariable> - <stateVariable sendEvents="no"> - <name>A_ARG_TYPE_BrowseFlag</name> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>BrowseMetadata</allowedValue> - <allowedValue>BrowseDirectChildren</allowedValue> - </allowedValueList> - </stateVariable> - <stateVariable sendEvents="no"> - <name>A_ARG_TYPE_Filter</name> - <dataType>string</dataType> - </stateVariable> - <stateVariable sendEvents="no"> - <name>A_ARG_TYPE_SortCriteria</name> - <dataType>string</dataType> - </stateVariable> - <stateVariable sendEvents="no"> - <name>A_ARG_TYPE_Index</name> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable sendEvents="no"> - <name>A_ARG_TYPE_Count</name> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable sendEvents="no"> - <name>A_ARG_TYPE_UpdateID</name> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable sendEvents="no"> - <name>SearchCapabilities</name> - <dataType>string</dataType> - </stateVariable> - <stateVariable sendEvents="no"> - <name>SortCapabilities</name> - <dataType>string</dataType> - </stateVariable> - <stateVariable sendEvents="yes"> - <name>SystemUpdateID</name> - <dataType>ui4</dataType> - </stateVariable> - </serviceStateTable> + <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> + <name>Browse</name> + <argumentList> + <argument> + <name>ObjectID</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable> + </argument> + <argument> + <name>BrowseFlag</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_BrowseFlag</relatedStateVariable> + </argument> + <argument> + <name>Filter</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_Filter</relatedStateVariable> + </argument> + <argument> + <name>StartingIndex</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_Index</relatedStateVariable> + </argument> + <argument> + <name>RequestedCount</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> + </argument> + <argument> + <name>SortCriteria</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_SortCriteria</relatedStateVariable> + </argument> + <argument> + <name>Result</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_Result</relatedStateVariable> + </argument> + <argument> + <name>NumberReturned</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> + </argument> + <argument> + <name>TotalMatches</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> + </argument> + <argument> + <name>UpdateID</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_UpdateID</relatedStateVariable> + </argument> + </argumentList> + </action> + <action> + <name>Search</name> + <argumentList> + <argument> + <name>ContainerID</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable> + </argument> + <argument> + <name>SearchCriteria</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_SearchCriteria </relatedStateVariable> + </argument> + <argument> + <name>Filter</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_Filter</relatedStateVariable> + </argument> + <argument> + <name>StartingIndex</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_Index</relatedStateVariable> + </argument> + <argument> + <name>RequestedCount</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> + </argument> + <argument> + <name>SortCriteria</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_SortCriteria</relatedStateVariable> + </argument> + <argument> + <name>Result</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_Result</relatedStateVariable> + </argument> + <argument> + <name>NumberReturned</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> + </argument> + <argument> + <name>TotalMatches</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> + </argument> + <argument> + <name>UpdateID</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_UpdateID</relatedStateVariable> + </argument> + </argumentList> + </action> + </actionList> </scpd> diff --git a/httptnt/cds_scpd.o b/httptnt/cds_scpd.o Binary files differindex 40f462c..aa5d2d9 100644 --- a/httptnt/cds_scpd.o +++ b/httptnt/cds_scpd.o diff --git a/httptnt/deviceDescription.ecpp b/httptnt/deviceDescription.ecpp index f43ff8c..dfbe853 100644 --- a/httptnt/deviceDescription.ecpp +++ b/httptnt/deviceDescription.ecpp @@ -38,7 +38,6 @@ using namespace upnp; <major>1</major> <minor>0</minor> </specVersion> - <URLBase><$ urlBase $></URLBase> <device> <deviceType>urn:schemas-upnp-org:device:MediaServer:1</deviceType> <friendlyName><$ serverDescription.friendlyName $></friendlyName> @@ -50,7 +49,7 @@ using namespace upnp; <modelURL><$ serverDescription.modelURL $></modelURL> <serialNumber><$ serverDescription.serialNumber $></serialNumber> <UDN><$ deviceUUID $></UDN> - <presentationURL><$ presentationUrl $></presentationURL> + <presentationURL><$ urlBase $><$ presentationUrl $></presentationURL> <dlna:X_DLNADOC>DMS-1.50</dlna:X_DLNADOC> <serviceList> <{ @@ -63,7 +62,7 @@ using namespace upnp; <service> <serviceType><$ serviceDescription.serviceType $></serviceType> <serviceId><$ serviceDescription.serviceID $></serviceId> - <SCPDURL><$ serviceUrl $><$ serviceDescription.SCPDXML $></SCPDURL> + <SCPDURL><$ urlBase $><$ serviceUrl $><$ serviceDescription.SCPDXML $></SCPDURL> <controlURL><$ controlUrl $><$ serviceDescription.controlDescriptor $></controlURL> <eventSubURL><$ controlUrl $><$ serviceDescription.eventSubscriberDescriptor $></eventSubURL> </service> @@ -80,7 +79,7 @@ using namespace upnp; <width><$ (*it).profile.width $></width> <height><$ (*it).profile.height $></height> <depth><$ (int)(*it).profile.bitDepth $></depth> - <url><$ staticContentUrl $><$ (*it).filename $></url> + <url><$ urlBase $><$ staticContentUrl $><$ (*it).filename $></url> </icon> % }; </iconList> diff --git a/httptnt/deviceDescription.o b/httptnt/deviceDescription.o Binary files differindex b14f268..52c8b9f 100644 --- a/httptnt/deviceDescription.o +++ b/httptnt/deviceDescription.o |