diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2013-06-25 16:44:39 +0300 |
|---|---|---|
| committer | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2013-06-27 15:15:03 +0300 |
| commit | 55b7d3319c432438a3c43dd27ed8b757f9d934f7 (patch) | |
| tree | 8e510df271a6db8be48c630db624424ca8fae0c2 /data | |
| parent | 6a481ee70628b8a8a5f3cd78822544cb64651b49 (diff) | |
| download | rygel-55b7d3319c432438a3c43dd27ed8b757f9d934f7.tar.gz | |
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
Diffstat (limited to 'data')
| -rw-r--r-- | data/xml/AVTransport2.xml.in | 643 | ||||
| -rw-r--r-- | data/xml/ConnectionManager.xml.in | 125 | ||||
| -rw-r--r-- | data/xml/ContentDirectory-NoTrack.xml.in | 243 | ||||
| -rw-r--r-- | data/xml/ContentDirectory.xml.in | 253 | ||||
| -rw-r--r-- | data/xml/MediaServer3.xml.in.in | 5 | ||||
| -rw-r--r-- | data/xml/RenderingControl2.xml.in | 95 |
6 files changed, 684 insertions, 680 deletions
diff --git a/data/xml/AVTransport2.xml.in b/data/xml/AVTransport2.xml.in index b1626aff..c68e7b37 100644 --- a/data/xml/AVTransport2.xml.in +++ b/data/xml/AVTransport2.xml.in @@ -4,327 +4,6 @@ <major>1</major> <minor>0</minor> </specVersion> - <serviceStateTable> - <stateVariable sendEvents="no"> - <name>TransportState</name> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>STOPPED</allowedValue> - <allowedValue>PAUSED_PLAYBACK</allowedValue> - <allowedValue>PAUSED_RECORDING</allowedValue> - <allowedValue>PLAYING</allowedValue> - <allowedValue>RECORDING</allowedValue> - <allowedValue>TRANSITIONING</allowedValue> - <allowedValue>NO_MEDIA_PRESENT</allowedValue> - </allowedValueList> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>TransportStatus</name> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>OK</allowedValue> - <allowedValue>ERROR_OCCURRED</allowedValue> - </allowedValueList> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>CurrentMediaCategory</name> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>NO_MEDIA</allowedValue> - <allowedValue>TRACK_AWARE</allowedValue> - <allowedValue>TRACK_UNAWARE</allowedValue> - </allowedValueList> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>CurrentTransportActions</name> - <dataType>string</dataType> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>PlaybackStorageMedium</name> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>UNKNOWN</allowedValue> - <allowedValue>DV</allowedValue> - <allowedValue>MINI-DV</allowedValue> - <allowedValue>VHS</allowedValue> - <allowedValue>W-VHS</allowedValue> - <allowedValue>S-VHS</allowedValue> - <allowedValue>D-VHS</allowedValue> - <allowedValue>VHSC</allowedValue> - <allowedValue>VIDEO8</allowedValue> - <allowedValue>HI8</allowedValue> - <allowedValue>CD-ROM</allowedValue> - <allowedValue>CD-DA</allowedValue> - <allowedValue>CD-R</allowedValue> - <allowedValue>CD-RW</allowedValue> - <allowedValue>VIDEO-CD</allowedValue> - <allowedValue>SACD</allowedValue> - <allowedValue>MD-AUDIO</allowedValue> - <allowedValue>MD-PICTURE</allowedValue> - <allowedValue>DVD-ROM</allowedValue> - <allowedValue>DVD-VIDEO</allowedValue> - <allowedValue>DVD-R</allowedValue> - <allowedValue>DVD+RW</allowedValue> - <allowedValue>DVD-RW</allowedValue> - <allowedValue>DVD-RAM</allowedValue> - <allowedValue>DVD-AUDIO</allowedValue> - <allowedValue>DAT</allowedValue> - <allowedValue>LD</allowedValue> - <allowedValue>HDD</allowedValue> - <allowedValue>MICRO-MV</allowedValue> - <allowedValue>NETWORK</allowedValue> - <allowedValue>NONE</allowedValue> - <allowedValue>NOT_IMPLEMENTED</allowedValue> - <allowedValue>SD</allowedValue> - <allowedValue>PC-CARD</allowedValue> - <allowedValue>MMC</allowedValue> - <allowedValue>CF</allowedValue> - <allowedValue>BD</allowedValue> - <allowedValue>MS</allowedValue> - <allowedValue>HD_DVD</allowedValue> - </allowedValueList> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>RecordStorageMedium</name> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>UNKNOWN</allowedValue> - <allowedValue>DV</allowedValue> - <allowedValue>MINI-DV</allowedValue> - <allowedValue>VHS</allowedValue> - <allowedValue>W-VHS</allowedValue> - <allowedValue>S-VHS</allowedValue> - <allowedValue>D-VHS</allowedValue> - <allowedValue>VHSC</allowedValue> - <allowedValue>VIDEO8</allowedValue> - <allowedValue>HI8</allowedValue> - <allowedValue>CD-ROM</allowedValue> - <allowedValue>CD-DA</allowedValue> - <allowedValue>CD-R</allowedValue> - <allowedValue>CD-RW</allowedValue> - <allowedValue>VIDEO-CD</allowedValue> - <allowedValue>SACD</allowedValue> - <allowedValue>MD-AUDIO</allowedValue> - <allowedValue>MD-PICTURE</allowedValue> - <allowedValue>DVD-ROM</allowedValue> - <allowedValue>DVD-VIDEO</allowedValue> - <allowedValue>DVD-R</allowedValue> - <allowedValue>DVD+RW</allowedValue> - <allowedValue>DVD-RW</allowedValue> - <allowedValue>DVD-RAM</allowedValue> - <allowedValue>DVD-AUDIO</allowedValue> - <allowedValue>DAT</allowedValue> - <allowedValue>LD</allowedValue> - <allowedValue>HDD</allowedValue> - <allowedValue>MICRO-MV</allowedValue> - <allowedValue>NETWORK</allowedValue> - <allowedValue>NONE</allowedValue> - <allowedValue>NOT_IMPLEMENTED</allowedValue> - <allowedValue>SD</allowedValue> - <allowedValue>PC-CARD</allowedValue> - <allowedValue>MMC</allowedValue> - <allowedValue>CF</allowedValue> - <allowedValue>BD</allowedValue> - <allowedValue>MS</allowedValue> - <allowedValue>HD_DVD</allowedValue> - </allowedValueList> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>PossiblePlaybackStorageMedia</name> - <dataType>string</dataType> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>PossibleRecordStorageMedia</name> - <dataType>string</dataType> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>CurrentPlayMode</name> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>NORMAL</allowedValue> - </allowedValueList> - <defaultValue>NORMAL</defaultValue> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>TransportPlaySpeed</name> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>1</allowedValue> - </allowedValueList> - <defaultValue>1</defaultValue> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>RecordMediumWriteStatus</name> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>WRITABLE</allowedValue> - <allowedValue>PROTECTED</allowedValue> - <allowedValue>NOT_WRITABLE</allowedValue> - <allowedValue>UNKNOWN</allowedValue> - <allowedValue>NOT_IMPLEMENTED</allowedValue> - </allowedValueList> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>CurrentRecordQualityMode</name> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>0:EP</allowedValue> - <allowedValue>1:LP</allowedValue> - <allowedValue>2:SP</allowedValue> - <allowedValue>0:BASIC</allowedValue> - <allowedValue>1:MEDIUM</allowedValue> - <allowedValue>2:HIGH</allowedValue> - <allowedValue>NOT_IMPLEMENTED</allowedValue> - </allowedValueList> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>PossibleRecordQualityModes</name> - <dataType>string</dataType> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>NumberOfTracks</name> - <dataType>ui4</dataType> - <allowedValueRange> - <minimum>0</minimum> - <maximum>512</maximum> - </allowedValueRange> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>CurrentTrack</name> - <dataType>ui4</dataType> - <allowedValueRange> - <minimum>0</minimum> - <maximum>512</maximum> - <step>1</step> - </allowedValueRange> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>CurrentTrackDuration</name> - <dataType>string</dataType> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>CurrentMediaDuration</name> - <dataType>string</dataType> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>CurrentTrackMetaData</name> - <dataType>string</dataType> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>CurrentTrackURI</name> - <dataType>string</dataType> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>AVTransportURI</name> - <dataType>string</dataType> - </stateVariable> - - <stateVariable sendEvents="no"> - <name>AVTransportURIMetaData</name> - <dataType>string</dataType> - </stateVariable> - - <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> @@ -686,5 +365,327 @@ </argumentList> </action> </actionList> + + <serviceStateTable> + <stateVariable sendEvents="no"> + <name>TransportState</name> + <dataType>string</dataType> + <allowedValueList> + <allowedValue>STOPPED</allowedValue> + <allowedValue>PAUSED_PLAYBACK</allowedValue> + <allowedValue>PAUSED_RECORDING</allowedValue> + <allowedValue>PLAYING</allowedValue> + <allowedValue>RECORDING</allowedValue> + <allowedValue>TRANSITIONING</allowedValue> + <allowedValue>NO_MEDIA_PRESENT</allowedValue> + </allowedValueList> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>TransportStatus</name> + <dataType>string</dataType> + <allowedValueList> + <allowedValue>OK</allowedValue> + <allowedValue>ERROR_OCCURRED</allowedValue> + </allowedValueList> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>CurrentMediaCategory</name> + <dataType>string</dataType> + <allowedValueList> + <allowedValue>NO_MEDIA</allowedValue> + <allowedValue>TRACK_AWARE</allowedValue> + <allowedValue>TRACK_UNAWARE</allowedValue> + </allowedValueList> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>CurrentTransportActions</name> + <dataType>string</dataType> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>PlaybackStorageMedium</name> + <dataType>string</dataType> + <allowedValueList> + <allowedValue>UNKNOWN</allowedValue> + <allowedValue>DV</allowedValue> + <allowedValue>MINI-DV</allowedValue> + <allowedValue>VHS</allowedValue> + <allowedValue>W-VHS</allowedValue> + <allowedValue>S-VHS</allowedValue> + <allowedValue>D-VHS</allowedValue> + <allowedValue>VHSC</allowedValue> + <allowedValue>VIDEO8</allowedValue> + <allowedValue>HI8</allowedValue> + <allowedValue>CD-ROM</allowedValue> + <allowedValue>CD-DA</allowedValue> + <allowedValue>CD-R</allowedValue> + <allowedValue>CD-RW</allowedValue> + <allowedValue>VIDEO-CD</allowedValue> + <allowedValue>SACD</allowedValue> + <allowedValue>MD-AUDIO</allowedValue> + <allowedValue>MD-PICTURE</allowedValue> + <allowedValue>DVD-ROM</allowedValue> + <allowedValue>DVD-VIDEO</allowedValue> + <allowedValue>DVD-R</allowedValue> + <allowedValue>DVD+RW</allowedValue> + <allowedValue>DVD-RW</allowedValue> + <allowedValue>DVD-RAM</allowedValue> + <allowedValue>DVD-AUDIO</allowedValue> + <allowedValue>DAT</allowedValue> + <allowedValue>LD</allowedValue> + <allowedValue>HDD</allowedValue> + <allowedValue>MICRO-MV</allowedValue> + <allowedValue>NETWORK</allowedValue> + <allowedValue>NONE</allowedValue> + <allowedValue>NOT_IMPLEMENTED</allowedValue> + <allowedValue>SD</allowedValue> + <allowedValue>PC-CARD</allowedValue> + <allowedValue>MMC</allowedValue> + <allowedValue>CF</allowedValue> + <allowedValue>BD</allowedValue> + <allowedValue>MS</allowedValue> + <allowedValue>HD_DVD</allowedValue> + </allowedValueList> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>RecordStorageMedium</name> + <dataType>string</dataType> + <allowedValueList> + <allowedValue>UNKNOWN</allowedValue> + <allowedValue>DV</allowedValue> + <allowedValue>MINI-DV</allowedValue> + <allowedValue>VHS</allowedValue> + <allowedValue>W-VHS</allowedValue> + <allowedValue>S-VHS</allowedValue> + <allowedValue>D-VHS</allowedValue> + <allowedValue>VHSC</allowedValue> + <allowedValue>VIDEO8</allowedValue> + <allowedValue>HI8</allowedValue> + <allowedValue>CD-ROM</allowedValue> + <allowedValue>CD-DA</allowedValue> + <allowedValue>CD-R</allowedValue> + <allowedValue>CD-RW</allowedValue> + <allowedValue>VIDEO-CD</allowedValue> + <allowedValue>SACD</allowedValue> + <allowedValue>MD-AUDIO</allowedValue> + <allowedValue>MD-PICTURE</allowedValue> + <allowedValue>DVD-ROM</allowedValue> + <allowedValue>DVD-VIDEO</allowedValue> + <allowedValue>DVD-R</allowedValue> + <allowedValue>DVD+RW</allowedValue> + <allowedValue>DVD-RW</allowedValue> + <allowedValue>DVD-RAM</allowedValue> + <allowedValue>DVD-AUDIO</allowedValue> + <allowedValue>DAT</allowedValue> + <allowedValue>LD</allowedValue> + <allowedValue>HDD</allowedValue> + <allowedValue>MICRO-MV</allowedValue> + <allowedValue>NETWORK</allowedValue> + <allowedValue>NONE</allowedValue> + <allowedValue>NOT_IMPLEMENTED</allowedValue> + <allowedValue>SD</allowedValue> + <allowedValue>PC-CARD</allowedValue> + <allowedValue>MMC</allowedValue> + <allowedValue>CF</allowedValue> + <allowedValue>BD</allowedValue> + <allowedValue>MS</allowedValue> + <allowedValue>HD_DVD</allowedValue> + </allowedValueList> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>PossiblePlaybackStorageMedia</name> + <dataType>string</dataType> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>PossibleRecordStorageMedia</name> + <dataType>string</dataType> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>CurrentPlayMode</name> + <dataType>string</dataType> + <allowedValueList> + <allowedValue>NORMAL</allowedValue> + </allowedValueList> + <defaultValue>NORMAL</defaultValue> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>TransportPlaySpeed</name> + <dataType>string</dataType> + <allowedValueList> + <allowedValue>1</allowedValue> + </allowedValueList> + <defaultValue>1</defaultValue> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>RecordMediumWriteStatus</name> + <dataType>string</dataType> + <allowedValueList> + <allowedValue>WRITABLE</allowedValue> + <allowedValue>PROTECTED</allowedValue> + <allowedValue>NOT_WRITABLE</allowedValue> + <allowedValue>UNKNOWN</allowedValue> + <allowedValue>NOT_IMPLEMENTED</allowedValue> + </allowedValueList> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>CurrentRecordQualityMode</name> + <dataType>string</dataType> + <allowedValueList> + <allowedValue>0:EP</allowedValue> + <allowedValue>1:LP</allowedValue> + <allowedValue>2:SP</allowedValue> + <allowedValue>0:BASIC</allowedValue> + <allowedValue>1:MEDIUM</allowedValue> + <allowedValue>2:HIGH</allowedValue> + <allowedValue>NOT_IMPLEMENTED</allowedValue> + </allowedValueList> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>PossibleRecordQualityModes</name> + <dataType>string</dataType> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>NumberOfTracks</name> + <dataType>ui4</dataType> + <allowedValueRange> + <minimum>0</minimum> + <maximum>512</maximum> + </allowedValueRange> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>CurrentTrack</name> + <dataType>ui4</dataType> + <allowedValueRange> + <minimum>0</minimum> + <maximum>512</maximum> + <step>1</step> + </allowedValueRange> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>CurrentTrackDuration</name> + <dataType>string</dataType> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>CurrentMediaDuration</name> + <dataType>string</dataType> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>CurrentTrackMetaData</name> + <dataType>string</dataType> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>CurrentTrackURI</name> + <dataType>string</dataType> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>AVTransportURI</name> + <dataType>string</dataType> + </stateVariable> + + <stateVariable sendEvents="no"> + <name>AVTransportURIMetaData</name> + <dataType>string</dataType> + </stateVariable> + + <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> </scpd> diff --git a/data/xml/ConnectionManager.xml.in b/data/xml/ConnectionManager.xml.in index a55d1e3b..da0da734 100644 --- 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 4c336fae..aabcbd87 100644 --- 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 e7db30db..b46f366a 100644 --- 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 8f02727c..aeefd1e0 100644 --- 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 5dbfd1d5..7250e441 100644 --- 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> |