diff options
| author | Xavier Claessens <xclaesse@gmail.com> | 2011-11-07 16:29:59 +0100 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2011-11-07 16:29:59 +0100 |
| commit | 14ca15687c9410a4883720a512f2f2c47fc29101 (patch) | |
| tree | 893c5f727991e772b6da94477c58ff63237a5bc9 /spec | |
| parent | ee528117e702687d2735405dacdb215a772326f5 (diff) | |
| parent | 243449d95b7f65bd144990e5481e5d42c82a9461 (diff) | |
Merge branch 'call1-mute'
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/spec/Call_Content.xml | 9 | ||||
| -rw-r--r-- | spec/spec/Call_Interface_Mute.xml | 8 | ||||
| -rw-r--r-- | spec/spec/Call_Stream.xml | 7 |
3 files changed, 15 insertions, 9 deletions
diff --git a/spec/spec/Call_Content.xml b/spec/spec/Call_Content.xml index e97e98fce..12061a29c 100644 --- a/spec/spec/Call_Content.xml +++ b/spec/spec/Call_Content.xml @@ -23,16 +23,17 @@ <interface name="org.freedesktop.Telepathy.Call1.Content" tp:causes-havoc="experimental"> <tp:added version="0.19.0">(draft 1)</tp:added> - <tp:requires - interface="org.freedesktop.Telepathy.Call1.Interface.Mute"/> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - This object represents one Content inside a <tp:dbus-ref + <p>This object represents one Content inside a <tp:dbus-ref namespace="ofdT.Channel.Type">Call1</tp:dbus-ref>. For example, in an audio/video call there would be one audio content and one video content. Each content has one or more <tp:dbus-ref namespace="ofdT.Call1">Stream</tp:dbus-ref> objects which - represent the actual transport to one or more remote contacts. + represent the actual transport to one or more remote contacts.</p> + <p>For protocols that support muting all streams of a given content + separately, this object MAY also implement the <tp:dbus-ref + namespace="ofdT.Call1.Interface">Mute</tp:dbus-ref> interface</p> </tp:docstring> <method name="Remove" tp:name-for-bindings="Remove"> diff --git a/spec/spec/Call_Interface_Mute.xml b/spec/spec/Call_Interface_Mute.xml index e0089720f..1202383f7 100644 --- a/spec/spec/Call_Interface_Mute.xml +++ b/spec/spec/Call_Interface_Mute.xml @@ -20,9 +20,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <interface name="org.freedesktop.Telepathy.Call1.Interface.Mute" tp:causes-havoc="experimental"> <tp:added version="0.19.6">(draft version, not API-stable)</tp:added> - <tp:xor-requires interface="org.freedesktop.Telepathy.Channel.Type.Call1"/> - <tp:xor-requires interface="org.freedesktop.Telepathy.Call1.Content"/> - <tp:xor-requires interface="org.freedesktop.Telepathy.Call1.Stream"/> + <tp:xor-requires> + <tp:requires interface="org.freedesktop.Telepathy.Channel.Type.Call1"/> + <tp:requires interface="org.freedesktop.Telepathy.Call1.Content"/> + <tp:requires interface="org.freedesktop.Telepathy.Call1.Stream"/> + </tp:xor-requires> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> <p>Interface for calls which may be muted. This only makes sense diff --git a/spec/spec/Call_Stream.xml b/spec/spec/Call_Stream.xml index 2693f5305..b71dacdb0 100644 --- a/spec/spec/Call_Stream.xml +++ b/spec/spec/Call_Stream.xml @@ -25,11 +25,14 @@ <tp:added version="0.19.0">(draft 1)</tp:added> <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - One stream inside a <tp:dbus-ref + <p>One stream inside a <tp:dbus-ref namespace="ofdT.Call1">Content</tp:dbus-ref>. A stream is a single flow of packets to and from a single remote endpoint. If your call connects to multiple people, you could have - multiple streams. + multiple streams.</p> + <p>For protocols that support muting streams separately, this object MAY + also implement the <tp:dbus-ref + namespace="ofdT.Call1.Interface">Mute</tp:dbus-ref> interface</p> </tp:docstring> <method name="SetSending" tp:name-for-bindings="Set_Sending"> |