xml templates: fix element order to match UDA 1.1

UPnP Device Architecture 1.1:
"The order of XML elements in device and service description documents
MUST adhere to the order as defined in the corresponding specification"

Note that this commit is not enough for compliance: when we dynamically
add optional elements, we must make sure they appear in the correct
place.

https://bugzilla.gnome.org/show_bug.cgi?id=702451

diff --git a/data/xml/AVTransport2.xml.in b/data/xml/AVTransport2.xml.in
index b1626af..c68e7b3 100644 (file)
--- a/data/xml/AVTransport2.xml.in
+++ b/data/xml/AVTransport2.xml.in
@@ -4,6 +4,368 @@
       <major>1</major>
       <minor>0</minor>
    </specVersion>
+
+   <actionList>
+      <action>
+         <name>SetAVTransportURI</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>CurrentURI</name>
+               <direction>in</direction>
+               <relatedStateVariable>AVTransportURI</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>CurrentURIMetaData</name>
+               <direction>in</direction>
+               <relatedStateVariable>AVTransportURIMetaData</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>GetMediaInfo</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>NrTracks</name>
+               <direction>out</direction>
+               <relatedStateVariable>NumberOfTracks</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>MediaDuration</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentMediaDuration</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>CurrentURI</name>
+               <direction>out</direction>
+               <relatedStateVariable>AVTransportURI</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>CurrentURIMetaData</name>
+               <direction>out</direction>
+               <relatedStateVariable>AVTransportURIMetaData</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>NextURI</name>
+               <direction>out</direction>
+               <relatedStateVariable>NextAVTransportURI</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>NextURIMetaData</name>
+               <direction>out</direction>
+               <relatedStateVariable>NextAVTransportURIMetaData</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>PlayMedium</name>
+               <direction>out</direction>
+               <relatedStateVariable>PlaybackStorageMedium</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>RecordMedium</name>
+               <direction>out</direction>
+               <relatedStateVariable>RecordStorageMedium</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>WriteStatus</name>
+               <direction>out</direction>
+               <relatedStateVariable>RecordMediumWriteStatus</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>GetMediaInfo_Ext</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>CurrentType</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentMediaCategory</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>NrTracks</name>
+               <direction>out</direction>
+               <relatedStateVariable>NumberOfTracks</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>MediaDuration</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentMediaDuration</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>CurrentURI</name>
+               <direction>out</direction>
+               <relatedStateVariable>AVTransportURI</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>CurrentURIMetaData</name>
+               <direction>out</direction>
+               <relatedStateVariable>AVTransportURIMetaData</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>NextURI</name>
+               <direction>out</direction>
+               <relatedStateVariable>NextAVTransportURI</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>NextURIMetaData</name>
+               <direction>out</direction>
+               <relatedStateVariable>NextAVTransportURIMetaData</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>PlayMedium</name>
+               <direction>out</direction>
+               <relatedStateVariable>PlaybackStorageMedium</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>RecordMedium</name>
+               <direction>out</direction>
+               <relatedStateVariable>RecordStorageMedium</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>WriteStatus</name>
+               <direction>out</direction>
+               <relatedStateVariable>RecordMediumWriteStatus</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>GetTransportInfo</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>CurrentTransportState</name>
+               <direction>out</direction>
+               <relatedStateVariable>TransportState</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>CurrentTransportStatus</name>
+               <direction>out</direction>
+               <relatedStateVariable>TransportStatus</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>CurrentSpeed</name>
+               <direction>out</direction>
+               <relatedStateVariable>TransportPlaySpeed</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>GetCurrentTransportActions</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>Actions</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentTransportActions</relatedStateVariable>
+            </argument>
+          </argumentList>
+      </action>
+
+      <action>
+         <name>GetPositionInfo</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>Track</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentTrack</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>TrackDuration</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentTrackDuration</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>TrackMetaData</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentTrackMetaData</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>TrackURI</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentTrackURI</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>RelTime</name>
+               <direction>out</direction>
+               <relatedStateVariable>RelativeTimePosition</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>AbsTime</name>
+               <direction>out</direction>
+               <relatedStateVariable>AbsoluteTimePosition</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>RelCount</name>
+               <direction>out</direction>
+               <relatedStateVariable>RelativeCounterPosition</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>AbsCount</name>
+               <direction>out</direction>
+               <relatedStateVariable>AbsoluteCounterPosition</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>GetDeviceCapabilities</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>PlayMedia</name>
+               <direction>out</direction>
+               <relatedStateVariable>PossiblePlaybackStorageMedia</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>RecMedia</name>
+               <direction>out</direction>
+               <relatedStateVariable>PossibleRecordStorageMedia</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>RecQualityModes</name>
+               <direction>out</direction>
+               <relatedStateVariable>PossibleRecordQualityModes</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>GetTransportSettings</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>PlayMode</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentPlayMode</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>RecQualityMode</name>
+               <direction>out</direction>
+               <relatedStateVariable>CurrentRecordQualityMode</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>Stop</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>Play</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>Speed</name>
+               <direction>in</direction>
+               <relatedStateVariable>TransportPlaySpeed</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>Pause</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>Seek</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>Unit</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_SeekMode</relatedStateVariable>
+            </argument>
+            <argument>
+               <name>Target</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_SeekTarget</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>Next</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+
+      <action>
+         <name>Previous</name>
+         <argumentList>
+            <argument>
+               <name>InstanceID</name>
+               <direction>in</direction>
+               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
+            </argument>
+         </argumentList>
+      </action>
+   </actionList>
+
    <serviceStateTable>
       <stateVariable sendEvents="no">
          <name>TransportState</name>
@@ -245,446 +607,85 @@
 
       <stateVariable sendEvents="no">
          <name>NextAVTransportURI</name>
-         <dataType>string</dataType>
-         <defaultValue>NOT_IMPLEMENTED</defaultValue>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>NextAVTransportURIMetaData</name>
-         <dataType>string</dataType>
-         <defaultValue>NOT_IMPLEMENTED</defaultValue>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>RelativeTimePosition</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>AbsoluteTimePosition</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>RelativeCounterPosition</name>
-         <dataType>i4</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>AbsoluteCounterPosition</name>
-         <dataType>ui4</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="yes">
-         <name>LastChange</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_SeekMode</name>
-         <dataType>string</dataType>
-         <allowedValueList>
-            <allowedValue>ABS_TIME</allowedValue>
-            <allowedValue>REL_TIME</allowedValue>
-            <allowedValue>TRACK_NR</allowedValue>
-         </allowedValueList>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_SeekTarget</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_InstanceID</name>
-         <dataType>ui4</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_DeviceUDN</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_ServiceType</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_ServiceID</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_StateVariableValuePairs</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_StateVariableList</name>
-         <dataType>string</dataType>
-      </stateVariable>
-   </serviceStateTable>
-
-   <actionList>
-      <action>
-         <name>SetAVTransportURI</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>CurrentURI</name>
-               <direction>in</direction>
-               <relatedStateVariable>AVTransportURI</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>CurrentURIMetaData</name>
-               <direction>in</direction>
-               <relatedStateVariable>AVTransportURIMetaData</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
-
-      <action>
-         <name>GetMediaInfo</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>NrTracks</name>
-               <direction>out</direction>
-               <relatedStateVariable>NumberOfTracks</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>MediaDuration</name>
-               <direction>out</direction>
-               <relatedStateVariable>CurrentMediaDuration</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>CurrentURI</name>
-               <direction>out</direction>
-               <relatedStateVariable>AVTransportURI</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>CurrentURIMetaData</name>
-               <direction>out</direction>
-               <relatedStateVariable>AVTransportURIMetaData</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>NextURI</name>
-               <direction>out</direction>
-               <relatedStateVariable>NextAVTransportURI</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>NextURIMetaData</name>
-               <direction>out</direction>
-               <relatedStateVariable>NextAVTransportURIMetaData</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>PlayMedium</name>
-               <direction>out</direction>
-               <relatedStateVariable>PlaybackStorageMedium</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>RecordMedium</name>
-               <direction>out</direction>
-               <relatedStateVariable>RecordStorageMedium</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>WriteStatus</name>
-               <direction>out</direction>
-               <relatedStateVariable>RecordMediumWriteStatus</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
-
-      <action>
-         <name>GetMediaInfo_Ext</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>CurrentType</name>
-               <direction>out</direction>
-               <relatedStateVariable>CurrentMediaCategory</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>NrTracks</name>
-               <direction>out</direction>
-               <relatedStateVariable>NumberOfTracks</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>MediaDuration</name>
-               <direction>out</direction>
-               <relatedStateVariable>CurrentMediaDuration</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>CurrentURI</name>
-               <direction>out</direction>
-               <relatedStateVariable>AVTransportURI</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>CurrentURIMetaData</name>
-               <direction>out</direction>
-               <relatedStateVariable>AVTransportURIMetaData</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>NextURI</name>
-               <direction>out</direction>
-               <relatedStateVariable>NextAVTransportURI</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>NextURIMetaData</name>
-               <direction>out</direction>
-               <relatedStateVariable>NextAVTransportURIMetaData</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>PlayMedium</name>
-               <direction>out</direction>
-               <relatedStateVariable>PlaybackStorageMedium</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>RecordMedium</name>
-               <direction>out</direction>
-               <relatedStateVariable>RecordStorageMedium</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>WriteStatus</name>
-               <direction>out</direction>
-               <relatedStateVariable>RecordMediumWriteStatus</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
-
-      <action>
-         <name>GetTransportInfo</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>CurrentTransportState</name>
-               <direction>out</direction>
-               <relatedStateVariable>TransportState</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>CurrentTransportStatus</name>
-               <direction>out</direction>
-               <relatedStateVariable>TransportStatus</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>CurrentSpeed</name>
-               <direction>out</direction>
-               <relatedStateVariable>TransportPlaySpeed</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
+         <dataType>string</dataType>
+         <defaultValue>NOT_IMPLEMENTED</defaultValue>
+      </stateVariable>
 
-      <action>
-         <name>GetCurrentTransportActions</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>Actions</name>
-               <direction>out</direction>
-               <relatedStateVariable>CurrentTransportActions</relatedStateVariable>
-            </argument>
-          </argumentList>
-      </action>
+      <stateVariable sendEvents="no">
+         <name>NextAVTransportURIMetaData</name>
+         <dataType>string</dataType>
+         <defaultValue>NOT_IMPLEMENTED</defaultValue>
+      </stateVariable>
 
-      <action>
-         <name>GetPositionInfo</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>Track</name>
-               <direction>out</direction>
-               <relatedStateVariable>CurrentTrack</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>TrackDuration</name>
-               <direction>out</direction>
-               <relatedStateVariable>CurrentTrackDuration</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>TrackMetaData</name>
-               <direction>out</direction>
-               <relatedStateVariable>CurrentTrackMetaData</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>TrackURI</name>
-               <direction>out</direction>
-               <relatedStateVariable>CurrentTrackURI</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>RelTime</name>
-               <direction>out</direction>
-               <relatedStateVariable>RelativeTimePosition</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>AbsTime</name>
-               <direction>out</direction>
-               <relatedStateVariable>AbsoluteTimePosition</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>RelCount</name>
-               <direction>out</direction>
-               <relatedStateVariable>RelativeCounterPosition</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>AbsCount</name>
-               <direction>out</direction>
-               <relatedStateVariable>AbsoluteCounterPosition</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
+      <stateVariable sendEvents="no">
+         <name>RelativeTimePosition</name>
+         <dataType>string</dataType>
+      </stateVariable>
 
-      <action>
-         <name>GetDeviceCapabilities</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>PlayMedia</name>
-               <direction>out</direction>
-               <relatedStateVariable>PossiblePlaybackStorageMedia</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>RecMedia</name>
-               <direction>out</direction>
-               <relatedStateVariable>PossibleRecordStorageMedia</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>RecQualityModes</name>
-               <direction>out</direction>
-               <relatedStateVariable>PossibleRecordQualityModes</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
+      <stateVariable sendEvents="no">
+         <name>AbsoluteTimePosition</name>
+         <dataType>string</dataType>
+      </stateVariable>
 
-      <action>
-         <name>GetTransportSettings</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>PlayMode</name>
-               <direction>out</direction>
-               <relatedStateVariable>CurrentPlayMode</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>RecQualityMode</name>
-               <direction>out</direction>
-               <relatedStateVariable>CurrentRecordQualityMode</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
+      <stateVariable sendEvents="no">
+         <name>RelativeCounterPosition</name>
+         <dataType>i4</dataType>
+      </stateVariable>
 
-      <action>
-         <name>Stop</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
+      <stateVariable sendEvents="no">
+         <name>AbsoluteCounterPosition</name>
+         <dataType>ui4</dataType>
+      </stateVariable>
 
-      <action>
-         <name>Play</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>Speed</name>
-               <direction>in</direction>
-               <relatedStateVariable>TransportPlaySpeed</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
+      <stateVariable sendEvents="yes">
+         <name>LastChange</name>
+         <dataType>string</dataType>
+      </stateVariable>
 
-      <action>
-         <name>Pause</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_SeekMode</name>
+         <dataType>string</dataType>
+         <allowedValueList>
+            <allowedValue>ABS_TIME</allowedValue>
+            <allowedValue>REL_TIME</allowedValue>
+            <allowedValue>TRACK_NR</allowedValue>
+         </allowedValueList>
+      </stateVariable>
 
-      <action>
-         <name>Seek</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>Unit</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_SeekMode</relatedStateVariable>
-            </argument>
-            <argument>
-               <name>Target</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_SeekTarget</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_SeekTarget</name>
+         <dataType>string</dataType>
+      </stateVariable>
 
-      <action>
-         <name>Next</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_InstanceID</name>
+         <dataType>ui4</dataType>
+      </stateVariable>
 
-      <action>
-         <name>Previous</name>
-         <argumentList>
-            <argument>
-               <name>InstanceID</name>
-               <direction>in</direction>
-               <relatedStateVariable>A_ARG_TYPE_InstanceID</relatedStateVariable>
-            </argument>
-         </argumentList>
-      </action>
-   </actionList>
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_DeviceUDN</name>
+         <dataType>string</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_ServiceType</name>
+         <dataType>string</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_ServiceID</name>
+         <dataType>string</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_StateVariableValuePairs</name>
+         <dataType>string</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_StateVariableList</name>
+         <dataType>string</dataType>
+      </stateVariable>
+   </serviceStateTable>
 </scpd>
 

diff --git a/data/xml/ConnectionManager.xml.in b/data/xml/ConnectionManager.xml.in
index a55d1e3..da0da73 100644 (file)
--- a/data/xml/ConnectionManager.xml.in
+++ b/data/xml/ConnectionManager.xml.in
@@ -4,68 +4,6 @@
       <major>1</major>
       <minor>0</minor>
    </specVersion>
-   <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>
 
    <actionList>
       <action>
@@ -141,4 +79,67 @@
          </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>

diff --git a/data/xml/ContentDirectory-NoTrack.xml.in b/data/xml/ContentDirectory-NoTrack.xml.in
index 4c336fa..aabcbd8 100644 (file)
--- a/data/xml/ContentDirectory-NoTrack.xml.in
+++ b/data/xml/ContentDirectory-NoTrack.xml.in
@@ -4,127 +4,6 @@
       <major>1</major>
       <minor>0</minor>
    </specVersion>
-   <serviceStateTable>
-      <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>ServiceResetToken</name>
-          <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>FeatureList</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <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>A_ARG_TYPE_SearchCriteria</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_TagValueList</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_TransferID</name>
-         <dataType>ui4</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="yes">
-         <name>TransferIDs</name>
-         <dataType>string</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>
-   </serviceStateTable>
 
    <actionList>
       <action>
@@ -419,4 +298,126 @@
          </argumentList>
       </action>
    </actionList>
+
+   <serviceStateTable>
+      <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>ServiceResetToken</name>
+          <dataType>string</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>FeatureList</name>
+         <dataType>string</dataType>
+      </stateVariable>
+
+      <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>A_ARG_TYPE_SearchCriteria</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_TagValueList</name>
+         <dataType>string</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_TransferID</name>
+         <dataType>ui4</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="yes">
+         <name>TransferIDs</name>
+         <dataType>string</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>
+   </serviceStateTable>
 </scpd>

diff --git a/data/xml/ContentDirectory.xml.in b/data/xml/ContentDirectory.xml.in
index e7db30d..b46f366 100644 (file)
--- a/data/xml/ContentDirectory.xml.in
+++ b/data/xml/ContentDirectory.xml.in
@@ -4,132 +4,6 @@
       <major>1</major>
       <minor>0</minor>
    </specVersion>
-   <serviceStateTable>
-      <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>ServiceResetToken</name>
-          <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="yes">
-          <name>LastChange</name>
-          <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>FeatureList</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <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>A_ARG_TYPE_SearchCriteria</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_TagValueList</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_TransferID</name>
-         <dataType>ui4</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="yes">
-         <name>TransferIDs</name>
-         <dataType>string</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>
-   </serviceStateTable>
 
    <actionList>
       <action>
@@ -446,4 +320,131 @@
          </argumentList>
       </action>
    </actionList>
+
+   <serviceStateTable>
+      <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>ServiceResetToken</name>
+          <dataType>string</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="yes">
+          <name>LastChange</name>
+          <dataType>string</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>FeatureList</name>
+         <dataType>string</dataType>
+      </stateVariable>
+
+      <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>A_ARG_TYPE_SearchCriteria</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_TagValueList</name>
+         <dataType>string</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_TransferID</name>
+         <dataType>ui4</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="yes">
+         <name>TransferIDs</name>
+         <dataType>string</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>
+   </serviceStateTable>
 </scpd>

diff --git a/data/xml/MediaServer3.xml.in.in b/data/xml/MediaServer3.xml.in.in
index 8f02727..aeefd1e 100644 (file)
--- a/data/xml/MediaServer3.xml.in.in
+++ b/data/xml/MediaServer3.xml.in.in
@@ -6,15 +6,14 @@
   </specVersion>
   <device>
     <deviceType>urn:schemas-upnp-org:device:MediaServer:3</deviceType>
-    <UDN></UDN>
     <friendlyName></friendlyName>
     <manufacturer>Rygel Developers.</manufacturer>
     <manufacturerURL>@PACKAGE_URL@</manufacturerURL>
     <modelName>Rygel</modelName>
     <modelNumber>@VERSION@</modelNumber>
     <serialNumber>0000001</serialNumber>
-    <serviceList>
-    </serviceList>
+    <UDN></UDN>
+    <serviceList></serviceList>
     <dlna:X_DLNADOC>DMS-1.50</dlna:X_DLNADOC>
     <dlna:X_DLNADOC>M-DMS-1.50</dlna:X_DLNADOC>
     <dlna:X_DLNACAP>av-upload,image-upload,audio-upload,create-item-with-OCM-destroy-item</dlna:X_DLNACAP>

diff --git a/data/xml/RenderingControl2.xml.in b/data/xml/RenderingControl2.xml.in
index 5dbfd1d..7250e44 100644 (file)
--- a/data/xml/RenderingControl2.xml.in
+++ b/data/xml/RenderingControl2.xml.in
@@ -4,53 +4,6 @@
       <major>1</major>
       <minor>0</minor>
    </specVersion>
-   <serviceStateTable>
-      <stateVariable sendEvents="yes">
-         <name>LastChange</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>PresetNameList</name>
-         <dataType>string</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>Mute</name>
-         <dataType>boolean</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>Volume</name>
-         <dataType>ui2</dataType>
-         <allowedValueRange>
-            <minimum>0</minimum>
-            <maximum>100</maximum>
-            <step>1</step>
-         </allowedValueRange>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_Channel</name>
-         <dataType>string</dataType>
-         <allowedValueList>
-            <allowedValue>Master</allowedValue>
-         </allowedValueList>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_InstanceID</name>
-         <dataType>ui4</dataType>
-      </stateVariable>
-
-      <stateVariable sendEvents="no">
-         <name>A_ARG_TYPE_PresetName</name>
-         <dataType>string</dataType>
-         <allowedValueList>
-            <allowedValue>FactoryDefaults</allowedValue>
-         </allowedValueList>
-      </stateVariable>
-   </serviceStateTable>
 
    <actionList>
       <action>
@@ -169,4 +122,52 @@
          </argumentList>
       </action>
    </actionList>
+
+   <serviceStateTable>
+      <stateVariable sendEvents="yes">
+         <name>LastChange</name>
+         <dataType>string</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>PresetNameList</name>
+         <dataType>string</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>Mute</name>
+         <dataType>boolean</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>Volume</name>
+         <dataType>ui2</dataType>
+         <allowedValueRange>
+            <minimum>0</minimum>
+            <maximum>100</maximum>
+            <step>1</step>
+         </allowedValueRange>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_Channel</name>
+         <dataType>string</dataType>
+         <allowedValueList>
+            <allowedValue>Master</allowedValue>
+         </allowedValueList>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_InstanceID</name>
+         <dataType>ui4</dataType>
+      </stateVariable>
+
+      <stateVariable sendEvents="no">
+         <name>A_ARG_TYPE_PresetName</name>
+         <dataType>string</dataType>
+         <allowedValueList>
+            <allowedValue>FactoryDefaults</allowedValue>
+         </allowedValueList>
+      </stateVariable>
+   </serviceStateTable>
 </scpd>