diff options
| author | Alex Merry <dev@randomguy3.me.uk> | 2011-08-14 12:03:51 +0100 |
|---|---|---|
| committer | Alex Merry <dev@randomguy3.me.uk> | 2011-08-14 12:03:51 +0100 |
| commit | 8badc1d8fcaa46937585be6284b051444465d2ec (patch) | |
| tree | 6a89c0f65cdb0afc5c160d01e9b00dcf87abddf3 | |
| parent | 06b7090283b20e22165ce8528480be4dacb575ab (diff) | |
| parent | fef98a99d862a66653f5c65c6f89e83afde221b7 (diff) | |
Merge branch '2.1'
| -rw-r--r-- | doc/templates/interface.html | 2 | ||||
| -rw-r--r-- | spec/Player_Node.xml | 16 | ||||
| -rw-r--r-- | spec/all.xml | 6 |
3 files changed, 17 insertions, 7 deletions
diff --git a/doc/templates/interface.html b/doc/templates/interface.html index feac841..a736478 100644 --- a/doc/templates/interface.html +++ b/doc/templates/interface.html @@ -432,7 +432,7 @@ #elif $property.emits_changed == $property.EMITS_CHANGED_NONE <div class="annotation emits-changed emits-changed-none"> The <code>org.freedesktop.DBus.Properties.PropertiesChanged</code> - signal is <strong>not</strong> emitted when this property changes.</div> + signal is <strong>not</strong> emitted when this property changes. </div> #end if diff --git a/spec/Player_Node.xml b/spec/Player_Node.xml index 06ba4f2..b55b287 100644 --- a/spec/Player_Node.xml +++ b/spec/Player_Node.xml @@ -482,6 +482,11 @@ method on this interface and expect the current track to change. </p> <p> + If it is unknown whether a call to <tp:member-ref>Next</tp:member-ref> will + be successful (for example, when streaming tracks), this property should + be set to <strong>true</strong>. + </p> + <p> If <tp:member-ref>CanControl</tp:member-ref> is <strong>false</strong>, this property should also be <strong>false</strong>. @@ -509,6 +514,11 @@ expect the current track to change. </p> <p> + If it is unknown whether a call to <tp:member-ref>Previous</tp:member-ref> + will be successful (for example, when streaming tracks), this property + should be set to <strong>true</strong>. + </p> + <p> If <tp:member-ref>CanControl</tp:member-ref> is <strong>false</strong>, this property should also be <strong>false</strong>. @@ -538,7 +548,7 @@ <p> Note that this is related to whether there is a "current track": the value should not depend on whether the track is currently paused or - playing. In fact, if a track is currently playing + playing. In fact, if a track is currently playing (and <tp:member-ref>CanControl</tp:member-ref> is <strong>true</strong>), this should be <strong>true</strong>. </p> @@ -619,7 +629,7 @@ <p> If this is <strong>false</strong>, clients should assume that all properties on this interface are read-only (and will raise errors - if writing to them is attempted); all methods are not implemented + if writing to them is attempted), no methods are implemented and all other properties starting with "Can" are also <strong>false</strong>. </p> @@ -644,7 +654,7 @@ Indicates that the track position has changed in a way that is inconsistant with the current playing state. </p> - <p>When this signal is not received, clients should assume that :</p> + <p>When this signal is not received, clients should assume that:</p> <ul> <li> When playing, the position progresses according to the rate property. diff --git a/spec/all.xml b/spec/all.xml index 7c88aaa..47ca0af 100644 --- a/spec/all.xml +++ b/spec/all.xml @@ -46,9 +46,9 @@ for controlling media players. </p> <p> - It provides a mechanism for compliant media players discovery, - basic playback and media player state control as well as a tracklist - interface which is used to add context to the current item. + It provides a mechanism for discovery, querying and basic playback + control of compliant media players, as well as a tracklist + interface which is used to add context to the active media item. </p> </tp:docstring> </tp:section> |