Advertise version 2 of MS and AV services and some minor updates.

svn path=/trunk/; revision=123

diff --git a/ChangeLog b/ChangeLog
index faf20c1..0a6a688 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-21  Zeeshan Ali Khattak  <zeenix@gmail.com>
+
+       * data/xml/ConnectionManager.xml:
+       * data/xml/ContentDirectory.xml:
+       * data/xml/description.xml:
+
+       - Advertise version 2 of MS and AV services.
+       - Some minor updates.
+
 2008-04-13  Zeeshan Ali Khattak  <zeenix@gmail.com>
 
        * doc/design.txt:

diff --git a/data/xml/ConnectionManager.xml b/data/xml/ConnectionManager.xml
index cd3bfb3..eb6889d 100644 (file)
--- a/data/xml/ConnectionManager.xml
+++ b/data/xml/ConnectionManager.xml
@@ -1 +1,215 @@
-<?xml version="1.0"?><scpd xmlns="urn:schemas-upnp-org:service-1-0"><specVersion><major>1</major><minor>0</minor></specVersion><actionList><action><name>GetProtocolInfo</name><argumentList><argument><name>Source</name><direction>out</direction><relatedStateVariable>SourceProtocolInfo</relatedStateVariable></argument><argument><name>Sink</name><direction>out</direction><relatedStateVariable>SinkProtocolInfo</relatedStateVariable></argument></argumentList></action><action><name>ConnectionComplete</name><argumentList><argument><name>ConnectionID</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable></argument></argumentList></action><action><name>GetCurrentConnectionIDs</name><argumentList><argument><name>ConnectionIDs</name><direction>out</direction><relatedStateVariable>CurrentConnectionIDs</relatedStateVariable></argument></argumentList></action><action><name>GetCurrentConnectionInfo</name><argumentList><argument><name>ConnectionID</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable></argument><argument><name>RcsID</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_RcsID</relatedStateVariable></argument><argument><name>AVTransportID</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_AVTransportID</relatedStateVariable></argument><argument><name>ProtocolInfo</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_ProtocolInfo</relatedStateVariable></argument><argument><name>PeerConnectionManager</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_ConnectionManager</relatedStateVariable></argument><argument><name>PeerConnectionID</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable></argument><argument><name>Direction</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_Direction</relatedStateVariable></argument><argument><name>Status</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_ConnectionStatus</relatedStateVariable></argument></argumentList></action></actionList><serviceStateTable><stateVariable sendEvents="yes"><name>SourceProtocolInfo</name><dataType>string</dataType></stateVariable><stateVariable sendEvents="yes"><name>SinkProtocolInfo</name><dataType>string</dataType></stateVariable><stateVariable sendEvents="yes"><name>CurrentConnectionIDs</name><dataType>string</dataType></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_ConnectionStatus</name><dataType>string</dataType><allowedValueList><allowedValue>OK</allowedValue><allowedValue>ContentFormatMismatch</allowedValue><allowedValue>InsufficientBandwidth</allowedValue><allowedValue>UnreliableChannel</allowedValue><allowedValue>Unknown</allowedValue></allowedValueList></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_ConnectionManager</name><dataType>string</dataType></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_Direction</name><dataType>string</dataType><allowedValueList><allowedValue>Input</allowedValue><allowedValue>Output</allowedValue></allowedValueList></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_ProtocolInfo</name><dataType>string</dataType></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_ConnectionID</name><dataType>i4</dataType></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_AVTransportID</name><dataType>i4</dataType></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_RcsID</name><dataType>i4</dataType></stateVariable></serviceStateTable></scpd>
\ No newline at end of file
+<!--============================================================
+Title: UPnP AV Connection Manager Service (CM) Template
+
+Purpose:
+To identify the required/optional actions and state variables
+and the required allowed values defined by this service type.
+
+Note:
+This file uses tabs (not spaces) for block indentation.
+Any updates to this file should maintain this convention.
+This includes disabling any automatic tab-to-space conversion
+feature provided by your editor.
+================================================================--><scpd>
+       <serviceStateTable>
+               <stateVariable>
+                       <name>SourceProtocolInfo</name>
+                       <sendEventsAttribute>yes</sendEventsAttribute>
+                       <dataType>string</dataType>
+               </stateVariable>
+
+               <stateVariable>
+                       <name>SinkProtocolInfo</name>
+                       <sendEventsAttribute>yes</sendEventsAttribute>
+                       <dataType>string</dataType>
+               </stateVariable>
+
+               <stateVariable>
+                       <name>CurrentConnectionIDs</name>
+                       <sendEventsAttribute>yes</sendEventsAttribute>
+                       <dataType>string</dataType>
+               </stateVariable>
+
+               <stateVariable>
+                       <name>A_ARG_TYPE_ConnectionStatus</name>
+                       <sendEventsAttribute>no</sendEventsAttribute>
+                       <dataType>string</dataType>
+                       <allowedValueList>
+                               <allowedValue>OK</allowedValue>
+                               <allowedValue>ContentFormatMismatch</allowedValue>
+                               <allowedValue>InsufficientBandwidth</allowedValue>
+                               <allowedValue>UnreliableChannel</allowedValue>
+                               <allowedValue>Unknown</allowedValue>
+                       </allowedValueList>
+               </stateVariable>
+
+               <stateVariable>
+                       <name>A_ARG_TYPE_ConnectionManager</name>
+                       <sendEventsAttribute>no</sendEventsAttribute>
+                       <dataType>string</dataType>
+               </stateVariable>
+
+               <stateVariable>
+                       <name>A_ARG_TYPE_Direction</name>
+                       <sendEventsAttribute>no</sendEventsAttribute>
+                       <dataType>string</dataType>
+                       <allowedValueList>
+                               <allowedValue>Input</allowedValue>
+                               <allowedValue>Output</allowedValue>
+                       </allowedValueList>
+               </stateVariable>
+
+               <stateVariable>
+                       <name>A_ARG_TYPE_ProtocolInfo</name>
+                       <sendEventsAttribute>no</sendEventsAttribute>
+                       <dataType>string</dataType>
+               </stateVariable>
+
+               <stateVariable>
+                       <name>A_ARG_TYPE_ConnectionID</name>
+                       <sendEventsAttribute>no</sendEventsAttribute>
+                       <dataType>i4</dataType>
+               </stateVariable>
+
+               <stateVariable>
+                       <name>A_ARG_TYPE_AVTransportID</name>
+                       <sendEventsAttribute>no</sendEventsAttribute>
+                       <dataType>i4</dataType>
+               </stateVariable>
+
+               <stateVariable>
+                       <name>A_ARG_TYPE_RcsID</name>
+                       <sendEventsAttribute>no</sendEventsAttribute>
+                       <dataType>i4</dataType>
+               </stateVariable>
+       </serviceStateTable>
+
+       <actionList>
+               <action>
+                       <name>GetProtocolInfo</name>
+                       <argumentList>
+                               <argument>
+                                       <name>Source</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>SourceProtocolInfo</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>Sink</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>SinkProtocolInfo</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <Optional/>
+                       <name>PrepareForConnection</name>
+                       <argumentList>
+                               <argument>
+                                       <name>RemoteProtocolInfo</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ProtocolInfo</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>PeerConnectionManager</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ConnectionManager</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>PeerConnectionID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>Direction</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_Direction</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>ConnectionID</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>AVTransportID</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_AVTransportID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>RcsID</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_RcsID</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <Optional/>
+                       <name>ConnectionComplete</name>
+                       <argumentList>
+                               <argument>
+                                       <name>ConnectionID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <name>GetCurrentConnectionIDs</name>
+                       <argumentList>
+                               <argument>
+                                       <name>ConnectionIDs</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>CurrentConnectionIDs</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <name>GetCurrentConnectionInfo</name>
+                       <argumentList>
+                               <argument>
+                                       <name>ConnectionID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>RcsID</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_RcsID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>AVTransportID</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_AVTransportID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>ProtocolInfo</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ProtocolInfo</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>PeerConnectionManager</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ConnectionManager</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>PeerConnectionID</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ConnectionID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>Direction</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_Direction</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>Status</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ConnectionStatus</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+       </actionList>
+</scpd>

diff --git a/data/xml/ContentDirectory.xml b/data/xml/ContentDirectory.xml
index 862eb2f..d74a43c 100644 (file)
--- a/data/xml/ContentDirectory.xml
+++ b/data/xml/ContentDirectory.xml
@@ -1 +1,539 @@
-<?xml version="1.0"?><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><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><action><name>CreateObject</name><argumentList><argument><name>ContainerID</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable></argument><argument><name>Elements</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_Result</relatedStateVariable></argument><argument><name>ObjectID</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable></argument><argument><name>Result</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_Result</relatedStateVariable></argument></argumentList></action><action><name>DestroyObject</name><argumentList><argument><name>ObjectID</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable></argument></argumentList></action><action><name>UpdateObject</name><argumentList><argument><name>ObjectID</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable></argument><argument><name>CurrentTagValue</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_TagValueList</relatedStateVariable></argument><argument><name>NewTagValue</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_TagValueList</relatedStateVariable></argument></argumentList></action><action><name>ImportResource</name><argumentList><argument><name>SourceURI</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_URI</relatedStateVariable></argument><argument><name>DestinationURI</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_URI</relatedStateVariable></argument><argument><name>TransferID</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_TransferID</relatedStateVariable></argument></argumentList></action><action><name>GetTransferProgress</name><argumentList><argument><name>TransferID</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_TransferID</relatedStateVariable></argument><argument><name>TransferStatus</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_TransferStatus</relatedStateVariable></argument><argument><name>TransferLength</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_TransferLength</relatedStateVariable></argument><argument><name>TransferTotal</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_TransferTotal</relatedStateVariable></argument></argumentList></action><action><name>DeleteResource</name><argumentList><argument><name>ResourceURI</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_URI</relatedStateVariable></argument></argumentList></action><action><name>CreateReference</name><argumentList><argument><name>ContainerID</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable></argument><argument><name>ObjectID</name><direction>in</direction><relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable></argument><argument><name>NewID</name><direction>out</direction><relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable></argument></argumentList></action></actionList><serviceStateTable><stateVariable sendEvents="no"><name>A_ARG_TYPE_ObjectID</name><dataType>string</dataType></stateVariable><stateVariable sendEvents="yes"><name>TransferIDs</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_SearchCriteria</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_URI</name><dataType>uri</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_TransferID</name><dataType>ui4</dataType></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_TransferStatus</name><dataType>string</dataType><allowedValueList><allowedValue>COMPLETED</allowedValue><allowedValue>ERROR</allowedValue><allowedValue>IN_PROGRESS</allowedValue><allowedValue>STOPPED</allowedValue></allowedValueList></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_TransferLength</name><dataType>string</dataType></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_TransferTotal</name><dataType>string</dataType></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_TagValueList</name><dataType>string</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><stateVariable sendEvents="yes"><name>ContainerUpdateIDs</name><dataType>string</dataType></stateVariable><stateVariable sendEvents="no"><name>A_ARG_TYPE_UpdateID</name><dataType>ui4</dataType></stateVariable></serviceStateTable></scpd>
\ No newline at end of file
+<!--============================================================
+Title: UPnP AV Content Directory Service (CDS) Template
+
+Purpose:
+To identify the required/optional actions and state variables
+and the required allowed values defined by this service type.
+
+Note:
+This file uses tabs (not spaces) for block indentation.
+Any updates to this file should maintain this convention.
+This includes disabling any automatic tab-to-space conversion
+feature provided by your editor.
+================================================================-->
+<scpd>
+       <serviceStateTable>
+               <stateVariable>
+                       <name>SearchCapabilities</name>
+                       <sendEventsAttribute>no</sendEventsAttribute>
+                       <dataType>string</dataType>
+               </stateVariable>
+
+               <stateVariable>
+                       <name>SortCapabilities</name>
+                       <sendEventsAttribute>no</sendEventsAttribute>
+                       <dataType>string</dataType>
+               </stateVariable>
+
+               <stateVariable>
+                       <Optional/>
+                       <name>SortExtensionCapabilities</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>
+
+               <stateVariable>
+                       <Optional/>
+                       <name>TransferIDs</name>
+                       <sendEventsAttribute>yes</sendEventsAttribute>
+                       <dataType>string</dataType>
+               </stateVariable>
+
+               <stateVariable>
+                       <name>FeatureList</name>
+                       <sendEventsAttribute>no</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>
+       </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>
+                       <Optional/>
+                       <name>GetSortExtensionCapabilities</name>
+                       <argumentList>
+                               <argument>
+                                       <name>SortExtensionCaps</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>SortExtensionCapabilities</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <name>GetFeatureList</name>
+                       <argumentList>
+                               <argument>
+                                       <name>FeatureList</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>FeatureList</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>
+                       <Optional/>
+                       <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>
+
+               <action>
+                       <Optional/>
+                       <name>CreateObject</name>
+                       <argumentList>
+                               <argument>
+                                       <name>ContainerID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>Elements</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_Result</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>ObjectID</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>Result</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_Result</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <Optional/>
+                       <name>DestroyObject</name>
+                       <argumentList>
+                               <argument>
+                                       <name>ObjectID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <Optional/>
+                       <name>UpdateObject</name>
+                       <argumentList>
+                               <argument>
+                                       <name>ObjectID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>CurrentTagValue</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_TagValueList</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>NewTagValue</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_TagValueList</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <Optional/>
+                       <name>MoveObject</name>
+                       <argumentList>
+                               <argument>
+                                       <name>objectID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>NewParentID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>NewObjectID</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <Optional/>
+                       <name>ImportResource</name>
+                       <argumentList>
+                               <argument>
+                                       <name>SourceURI</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_URI</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>DestinationURI</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_URI</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>TransferID</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_TransferID</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <Optional/>
+                       <name>ExportResource</name>
+                       <argumentList>
+                               <argument>
+                                       <name>SourceURI</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_URI</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>DestinationURI</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_URI</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>TransferID</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_TransferID</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <Optional/>
+                       <name>DeleteResource</name>
+                       <argumentList>
+                               <argument>
+                                       <name>ResourceURI</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_URI</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <Optional/>
+                       <name>StopTransferResource</name>
+                       <argumentList>
+                               <argument>
+                                       <name>TransferID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_TransferID</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <Optional/>
+                       <name>GetTransferProgress</name>
+                       <argumentList>
+                               <argument>
+                                       <name>TransferID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_TransferID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>TransferStatus</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_TransferStatus</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>TransferLength</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_TransferLength</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>TransferTotal</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_TransferTotal</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+
+               <action>
+                       <Optional/>
+                       <name>CreateReference</name>
+                       <argumentList>
+                               <argument>
+                                       <name>ContainerID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>ObjectID</name>
+                                       <direction>in</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable>
+                               </argument>
+                               <argument>
+                                       <name>NewID</name>
+                                       <direction>out</direction>
+                                       <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable>
+                               </argument>
+                       </argumentList>
+               </action>
+       </actionList>
+</scpd>

diff --git a/data/xml/description.xml b/data/xml/description.xml
index 1405630..4aacdec 100644 (file)
--- a/data/xml/description.xml
+++ b/data/xml/description.xml
@@ -4,12 +4,12 @@
 <minor>0</minor>
 </specVersion>
 <device>
-<deviceType>urn:schemas-upnp-org:device:MediaServer:1</deviceType>
+<deviceType>urn:schemas-upnp-org:device:MediaServer:2</deviceType>
 <UDN></UDN>
 <friendlyName></friendlyName>
-<manufacturer>OpenedHand Ltd</manufacturer>
-<manufacturerURL>http://openedhand.com/</manufacturerURL>
-<modelName>rhythmbox-gupnp</modelName>
+<manufacturer>GUPnP Team</manufacturer>
+<manufacturerURL>http://www.gupnp.org/</manufacturerURL>
+<modelName>gupnp-media-server</modelName>
 <modelNumber>0.1</modelNumber>
 <modelDescription></modelDescription>
 <serialNumber>0000001</serialNumber>
@@ -17,16 +17,16 @@
 <presentationURL></presentationURL>
 <serviceList>
 <service>
-<serviceType>urn:schemas-upnp-org:service:ContentDirectory:1</serviceType>
+<serviceType>urn:schemas-upnp-org:service:ContentDirectory:2</serviceType>
 <serviceId>urn:upnp-org:serviceId:ContentDirectory</serviceId>
-<SCPDURL>/ContentDirectory.xml</SCPDURL>
+<SCPDURL>xml/ContentDirectory.xml</SCPDURL>
 <eventSubURL>/ContentDirectory/Event</eventSubURL>
 <controlURL>/ContentDirectory/Control</controlURL>
 </service>
 <service>
-<serviceType>urn:schemas-upnp-org:service:ConnectionManager:1</serviceType>
+<serviceType>urn:schemas-upnp-org:service:ConnectionManager:2</serviceType>
 <serviceId>urn:upnp-org:serviceId:ConnectionManager</serviceId>
-<SCPDURL>/ConnectionManager.xml</SCPDURL>
+<SCPDURL>xml/ConnectionManager.xml</SCPDURL>
 <eventSubURL>/ConnectionManager/Event</eventSubURL>
 <controlURL>/ConnectionManager/Control</controlURL>
 </service>