[rygel] data: Remove schema annotations from SCDP files
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] data: Remove schema annotations from SCDP files
- Date: Thu, 23 Jun 2011 11:00:55 +0000 (UTC)
commit 8b8a9c174f444fc5cde6faba67fa77b1a463de21
Author: Jens Georg <mail jensge org>
Date: Thu Jun 23 12:04:37 2011 +0200
data: Remove schema annotations from SCDP files
The files were taken from the UPnP forum website, but those files are
for use with the UPnP Certification test tool and carry additional
annotations.
data/xml/AVTransport2.xml.in | 91 +++++++++-----------------
data/xml/ConnectionManager.xml.in | 30 +++------
data/xml/ContentDirectory.xml.in | 74 ++++++---------------
data/xml/RenderingControl2.xml.in | 28 ++------
data/xml/X_MS_MediaReceiverRegistrar1.xml.in | 24 ++-----
5 files changed, 75 insertions(+), 172 deletions(-)
---
diff --git a/data/xml/AVTransport2.xml.in b/data/xml/AVTransport2.xml.in
index 13f1f10..4afb205 100644
--- a/data/xml/AVTransport2.xml.in
+++ b/data/xml/AVTransport2.xml.in
@@ -14,9 +14,8 @@ feature provided by your editor.
================================================================-->
<scpd>
<serviceStateTable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>TransportState</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>STOPPED</allowedValue>
@@ -24,9 +23,8 @@ feature provided by your editor.
</allowedValueList>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>TransportStatus</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>OK</allowedValue>
@@ -34,9 +32,8 @@ feature provided by your editor.
</allowedValueList>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>CurrentMediaCategory</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>NO_MEDIA</allowedValue>
@@ -45,33 +42,28 @@ feature provided by your editor.
</allowedValueList>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>PlaybackStorageMedium</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>RecordStorageMedium</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>PossiblePlaybackStorageMedia</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>PossibleRecordStorageMedia</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>CurrentPlayMode</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>NORMAL</allowedValue>
@@ -79,9 +71,8 @@ feature provided by your editor.
<defaultValue>NORMAL</defaultValue>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>TransportPlaySpeed</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>1</allowedValue>
@@ -89,36 +80,31 @@ feature provided by your editor.
<defaultValue>1</defaultValue>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>RecordMediumWriteStatus</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>CurrentRecordQualityMode</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>PossibleRecordQualityModes</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>NumberOfTracks</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>ui4</dataType>
<allowedValueRange>
<minimum>0</minimum>
</allowedValueRange>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>CurrentTrack</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>ui4</dataType>
<allowedValueRange>
<minimum>0</minimum>
@@ -126,87 +112,73 @@ feature provided by your editor.
</allowedValueRange>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>CurrentTrackDuration</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>CurrentMediaDuration</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>CurrentTrackMetaData</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>CurrentTrackURI</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>AVTransportURI</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>AVTransportURIMetaData</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>NextAVTransportURI</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>NextAVTransportURIMetaData</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>RelativeTimePosition</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>AbsoluteTimePosition</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>RelativeCounterPosition</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>i4</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>AbsoluteCounterPosition</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>i4</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="yes">
<name>LastChange</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_SeekMode</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>ABS_TIME</allowedValue>
@@ -214,15 +186,13 @@ feature provided by your editor.
</allowedValueList>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_SeekTarget</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_InstanceID</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>ui4</dataType>
</stateVariable>
</serviceStateTable>
@@ -518,7 +488,6 @@ feature provided by your editor.
</action>
<action>
- <Optional/>
<name>Pause</name>
<argumentList>
<argument>
diff --git a/data/xml/ConnectionManager.xml.in b/data/xml/ConnectionManager.xml.in
index 7fa40e8..fb81e8f 100644
--- a/data/xml/ConnectionManager.xml.in
+++ b/data/xml/ConnectionManager.xml.in
@@ -18,27 +18,23 @@ feature provided by your editor.
<minor>0</minor>
</specVersion>
<serviceStateTable>
- <stateVariable>
+ <stateVariable sendEvents="yes">
<name>SourceProtocolInfo</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="yes">
<name>SinkProtocolInfo</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="yes">
<name>CurrentConnectionIDs</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_ConnectionStatus</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>OK</allowedValue>
@@ -49,15 +45,13 @@ feature provided by your editor.
</allowedValueList>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_ConnectionManager</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_Direction</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>Input</allowedValue>
@@ -65,27 +59,23 @@ feature provided by your editor.
</allowedValueList>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_ProtocolInfo</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_ConnectionID</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>i4</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_AVTransportID</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>i4</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_RcsID</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>i4</dataType>
</stateVariable>
</serviceStateTable>
diff --git a/data/xml/ContentDirectory.xml.in b/data/xml/ContentDirectory.xml.in
index ff62780..48ea282 100644
--- a/data/xml/ContentDirectory.xml.in
+++ b/data/xml/ContentDirectory.xml.in
@@ -18,52 +18,43 @@ feature provided by your editor.
<minor>0</minor>
</specVersion>
<serviceStateTable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>SearchCapabilities</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>SortCapabilities</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="yes">
<name>SystemUpdateID</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>ui4</dataType>
</stateVariable>
- <stateVariable>
- <Optional/>
+ <stateVariable sendEvents="yes">
<name>ContainerUpdateIDs</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>FeatureList</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_ObjectID</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_Result</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_BrowseFlag</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>BrowseMetadata</allowedValue>
@@ -71,68 +62,53 @@ feature provided by your editor.
</allowedValueList>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_Filter</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_SortCriteria</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_Index</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>ui4</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_Count</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>ui4</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_UpdateID</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>ui4</dataType>
</stateVariable>
- <stateVariable>
- <Optional/>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_SearchCriteria</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
- <Optional/>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_URI</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>uri</dataType>
</stateVariable>
- <stateVariable>
- <Optional/>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_TransferID</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>ui4</dataType>
</stateVariable>
- <stateVariable>
- <Optional/>
+ <stateVariable sendEvents="yes">
<name>TransferIDs</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
- <Optional/>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_TransferStatus</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>COMPLETED</allowedValue>
@@ -142,17 +118,13 @@ feature provided by your editor.
</allowedValueList>
</stateVariable>
- <stateVariable>
- <Optional/>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_TransferLength</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
- <Optional/>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_TransferTotal</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
</serviceStateTable>
@@ -260,7 +232,6 @@ feature provided by your editor.
</action>
<action>
- <Optional/>
<name>Search</name>
<argumentList>
<argument>
@@ -317,7 +288,6 @@ feature provided by your editor.
</action>
<action>
- <Optional/>
<name>CreateObject</name>
<argumentList>
<argument>
@@ -344,7 +314,6 @@ feature provided by your editor.
</action>
<action>
- <Optional/>
<name>DestroyObject</name>
<argumentList>
<argument>
@@ -356,7 +325,6 @@ feature provided by your editor.
</action>
<action>
- <Optional/>
<name>ImportResource</name>
<argumentList>
<argument>
@@ -378,7 +346,6 @@ feature provided by your editor.
</action>
<action>
- <Optional/>
<name>GetTransferProgress</name>
<argumentList>
<argument>
@@ -405,7 +372,6 @@ feature provided by your editor.
</action>
<action>
- <Optional/>
<name>StopTransferResource</name>
<argumentList>
<argument>
diff --git a/data/xml/RenderingControl2.xml.in b/data/xml/RenderingControl2.xml.in
index 59af6f1..75cbbff 100644
--- a/data/xml/RenderingControl2.xml.in
+++ b/data/xml/RenderingControl2.xml.in
@@ -14,29 +14,23 @@ feature provided by your editor.
================================================================-->
<scpd>
<serviceStateTable>
- <stateVariable>
+ <stateVariable sendEvents="yes">
<name>LastChange</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>PresetNameList</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
- <Optional/>
+ <stateVariable sendEvents="no">
<name>Mute</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>boolean</dataType>
</stateVariable>
- <stateVariable>
- <Optional/>
+ <stateVariable sendEvents="no">
<name>Volume</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>ui2</dataType>
<allowedValueRange>
<minimum>0</minimum>
@@ -44,25 +38,21 @@ feature provided by your editor.
</allowedValueRange>
</stateVariable>
- <stateVariable>
- <Optional/>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_Channel</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>Master</allowedValue>
</allowedValueList>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_InstanceID</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>ui4</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_PresetName</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
<allowedValueList>
<allowedValue>FactoryDefaults</allowedValue>
@@ -104,7 +94,6 @@ feature provided by your editor.
</action>
<action>
- <Optional/>
<name>GetMute</name>
<argumentList>
<argument>
@@ -126,7 +115,6 @@ feature provided by your editor.
</action>
<action>
- <Optional/>
<name>SetMute</name>
<argumentList>
<argument>
@@ -148,7 +136,6 @@ feature provided by your editor.
</action>
<action>
- <Optional/>
<name>GetVolume</name>
<argumentList>
<argument>
@@ -170,7 +157,6 @@ feature provided by your editor.
</action>
<action>
- <Optional/>
<name>SetVolume</name>
<argumentList>
<argument>
diff --git a/data/xml/X_MS_MediaReceiverRegistrar1.xml.in b/data/xml/X_MS_MediaReceiverRegistrar1.xml.in
index 061f664..3328717 100644
--- a/data/xml/X_MS_MediaReceiverRegistrar1.xml.in
+++ b/data/xml/X_MS_MediaReceiverRegistrar1.xml.in
@@ -37,44 +37,36 @@
</action>
</actionList>
<serviceStateTable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_DeviceID</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>string</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_Result</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>int</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_RegistrationReqMsg</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>bin.base64</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="no">
<name>A_ARG_TYPE_RegistrationRespMsg</name>
- <sendEventsAttribute>no</sendEventsAttribute>
<dataType>bin.base64</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="yes">
<name>AuthorizationGrantedUpdateID</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>ui4</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="yes">
<name>AuthorizationDeniedUpdateID</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>ui4</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="yes">
<name>ValidationSucceededUpdateID</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>ui4</dataType>
</stateVariable>
- <stateVariable>
+ <stateVariable sendEvents="yes">
<name>ValidationRevokedUpdateID</name>
- <sendEventsAttribute>yes</sendEventsAttribute>
<dataType>ui4</dataType>
</stateVariable>
</serviceStateTable>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
