From 216e4086520765fface77acd86a718dfb6e627e2 Mon Sep 17 00:00:00 2001 From: methodus Date: Sat, 15 Sep 2012 23:37:25 +0200 Subject: Anpassung der Plugin-Schnittstelle --- httptnt/cds_scpd.ecpp | 382 ++++++++++++++++++++++++++--------------- httptnt/cds_scpd.o | Bin 206016 -> 210528 bytes httptnt/deviceDescription.ecpp | 7 +- httptnt/deviceDescription.o | Bin 295912 -> 295880 bytes 4 files changed, 244 insertions(+), 145 deletions(-) (limited to 'httptnt') 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"); }> - - 1 - 0 - - - - GetSearchCapabilities - - - SearchCaps - out - SearchCapabilities - - - - - GetSortCapabilities - - - SortCaps - out - SortCapabilities - - - - - GetSystemUpdateID - - - Id - out - SystemUpdateID - - - - - Browse - - - ObjectID - in - A_ARG_TYPE_ObjectID - - - BrowseFlag - in - A_ARG_TYPE_BrowseFlag - - - Filter - in - A_ARG_TYPE_Filter - - - StartingIndex - in - A_ARG_TYPE_Index - - - RequestedCount - in - A_ARG_TYPE_Count - - - SortCriteria - in - A_ARG_TYPE_SortCriteria - - - Result - out - A_ARG_TYPE_Result - - - NumberReturned - out - A_ARG_TYPE_Count - - - TotalMatches - out - A_ARG_TYPE_Count - - - UpdateID - out - A_ARG_TYPE_UpdateID - - - - - - - A_ARG_TYPE_ObjectID - string - - - A_ARG_TYPE_Result - string - - - A_ARG_TYPE_BrowseFlag - string - - BrowseMetadata - BrowseDirectChildren - - - - A_ARG_TYPE_Filter - string - - - A_ARG_TYPE_SortCriteria - string - - - A_ARG_TYPE_Index - ui4 - - - A_ARG_TYPE_Count - ui4 - - - A_ARG_TYPE_UpdateID - ui4 - - - SearchCapabilities - string - - - SortCapabilities - string - - - SystemUpdateID - ui4 - - + + + TransferIDs + yes + string + + + A_ARG_TYPE_ObjectID no + string + + + A_ARG_TYPE_Result no + string + + + A_ARG_TYPE_SearchCriteria no + string + + + A_ARG_TYPE_BrowseFlag no + string + + BrowseMetadata + BrowseDirectChildren + + + + A_ARG_TYPE_Filter + no + string + + + A_ARG_TYPE_SortCriteria no + string + + + A_ARG_TYPE_Index no + ui4 + + + A_ARG_TYPE_Count no + ui4 + + + A_ARG_TYPE_UpdateID no + ui4 + + + A_ARG_TYPE_TransferID no + ui4 + + + A_ARG_TYPE_TransferStatus no + string + + COMPLETED + ERROR + IN_PROGRESS + STOPPED + + + + A_ARG_TYPE_TransferLength no + string + + + A_ARG_TYPE_TransferTotal no + string + + + A_ARG_TYPE_TagValueList no + string + + + A_ARG_TYPE_URI + no + uri + + + SearchCapabilities + no + string + + + SortCapabilities + no + string + + + SystemUpdateID + yes + ui4 + + + ContainerUpdateIDs +yes + string + + + + + GetSearchCapabilities + + + SearchCaps + out + SearchCapabilities + + + + + GetSortCapabilities + + + SortCaps + out + SortCapabilities + + + + + GetSystemUpdateID + + + Id + out + SystemUpdateID + + + + + Browse + + + ObjectID + in + A_ARG_TYPE_ObjectID + + + BrowseFlag + in + A_ARG_TYPE_BrowseFlag + + + Filter + in + A_ARG_TYPE_Filter + + + StartingIndex + in + A_ARG_TYPE_Index + + + RequestedCount + in + A_ARG_TYPE_Count + + + SortCriteria + in + A_ARG_TYPE_SortCriteria + + + Result + out + A_ARG_TYPE_Result + + + NumberReturned + out + A_ARG_TYPE_Count + + + TotalMatches + out + A_ARG_TYPE_Count + + + UpdateID + out + A_ARG_TYPE_UpdateID + + + + + Search + + + ContainerID + in + A_ARG_TYPE_ObjectID + + + SearchCriteria + in + A_ARG_TYPE_SearchCriteria + + + Filter + in + A_ARG_TYPE_Filter + + + StartingIndex + in + A_ARG_TYPE_Index + + + RequestedCount + in + A_ARG_TYPE_Count + + + SortCriteria + in + A_ARG_TYPE_SortCriteria + + + Result + out + A_ARG_TYPE_Result + + + NumberReturned + out + A_ARG_TYPE_Count + + + TotalMatches + out + A_ARG_TYPE_Count + + + UpdateID + out + A_ARG_TYPE_UpdateID + + + + diff --git a/httptnt/cds_scpd.o b/httptnt/cds_scpd.o index 40f462c..aa5d2d9 100644 Binary files a/httptnt/cds_scpd.o and b/httptnt/cds_scpd.o differ 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; 1 0 - <$ urlBase $> urn:schemas-upnp-org:device:MediaServer:1 <$ serverDescription.friendlyName $> @@ -50,7 +49,7 @@ using namespace upnp; <$ serverDescription.modelURL $> <$ serverDescription.serialNumber $> <$ deviceUUID $> - <$ presentationUrl $> + <$ urlBase $><$ presentationUrl $> DMS-1.50 <{ @@ -63,7 +62,7 @@ using namespace upnp; <$ serviceDescription.serviceType $> <$ serviceDescription.serviceID $> - <$ serviceUrl $><$ serviceDescription.SCPDXML $> + <$ urlBase $><$ serviceUrl $><$ serviceDescription.SCPDXML $> <$ controlUrl $><$ serviceDescription.controlDescriptor $> <$ controlUrl $><$ serviceDescription.eventSubscriberDescriptor $> @@ -80,7 +79,7 @@ using namespace upnp; <$ (*it).profile.width $> <$ (*it).profile.height $> <$ (int)(*it).profile.bitDepth $> - <$ staticContentUrl $><$ (*it).filename $> + <$ urlBase $><$ staticContentUrl $><$ (*it).filename $> % }; diff --git a/httptnt/deviceDescription.o b/httptnt/deviceDescription.o index b14f268..52c8b9f 100644 Binary files a/httptnt/deviceDescription.o and b/httptnt/deviceDescription.o differ -- cgit v1.2.3