[telepathy-spec/master] Splitout end-point into a seperate object so you can have multiple
Sjoerd Simons
sjoerd.simons at collabora.co.uk
Tue Dec 1 09:46:27 PST 2009
---
spec/Call_Stream_Endpoint.xml | 95 ++++++++++++++++++++++++++++++++++
spec/Call_Stream_Interface_Media.xml | 78 +++++-----------------------
spec/all.xml | 1 +
3 files changed, 110 insertions(+), 64 deletions(-)
create mode 100644 spec/Call_Stream_Endpoint.xml
diff --git a/spec/Call_Stream_Endpoint.xml b/spec/Call_Stream_Endpoint.xml
new file mode 100644
index 0000000..6ba41c5
--- /dev/null
+++ b/spec/Call_Stream_Endpoint.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" ?>
+<node name="/Call_Content"
+ xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
+ <tp:copyright>Copyright © 2009 Collabora Ltd.</tp:copyright>
+ <tp:copyright>Copyright © 2009 Nokia Corporation</tp:copyright>
+ <tp:license xmlns="http://www.w3.org/1999/xhtml">
+ <p>This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.</p>
+
+ <p>This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.</p>
+
+ <p>You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.</p>
+ </tp:license>
+
+ <interface name="org.freedesktop.Telepathy.Call.Stream.Endpoint.Draft"
+ tp:causes-havoc="experimental">
+ <tp:added version="0.17.UNRELEASED">(as a draft)</tp:added>
+
+ <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+ This object represents a set of candidates of one end-point.
+ </tp:docstring>
+
+ <property name="RemoteCredentials"
+ tp:name-for-bindings="Remote_Credentials"
+ type="ss" access="read">
+ </property>
+
+ <signal name="RemoteCredentialsSet"
+ tp:name-for-bindings="Remote_Credentials_Set">
+ <arg name="username" type="s" />
+ <arg name="password" type="s" />
+ </signal>
+
+ <property name="RemoteCandidates" tp:name-for-bindings="Remote_Candidates"
+ type="a(usqa{sv})" tp:type="Candidate[]" access="read">
+ </property>
+
+ <signal name="RemoteCandidatesAdded"
+ tp:name-for-bindings="Remote_Candidates_Added">
+ <arg name="Candidates"
+ type="a(usqa{sv})" tp:type="Candidate[]"/>
+ </signal>
+
+ <signal name="CandidateSelected"
+ tp:name-for-bindings="Candidate_Selected">
+ <arg name="Candidate"
+ type="(usqa{sv})" tp:type="Candidate"/>
+ </signal>
+
+ <property name="SelectedCandidate"
+ tp:name-for-bindings="Selected_Candidate"
+ type="(usqa{sv})" tp:type="Candidate" access="read">
+ </property>
+
+ <method name="SetSelectedCandidate"
+ tp:name-for-bindings="Set_Selected_Candidate">
+ <arg name="candidate"
+ type="(usqa{sv})" tp:type="Candidate" direction="in">
+ <tp:docstring>
+ </tp:docstring>
+ </arg>
+ </method>
+
+ <property name="StreamState" tp:name-for-bindings="Stream_State"
+ type="u" tp:type="Media_Stream_Type"
+ access="read">
+ </property>
+
+ <signal name="StreamStateChanged"
+ tp:name-for-bindings="Stream_State_Changed">
+ <arg name="state"
+ type="u" tp:type="Media_Stream_Type"/>
+ </signal>
+
+ <method name="SetStreamState"
+ tp:name-for-bindings="Set_Stream_State">
+ <arg name="state" type="u" tp:type="Media_Stream_Type"
+ direction="in" />
+ </method>
+
+ <property name="Transport" tp:name-for-bindings="Transport"
+ type="u" tp:type="Stream_Transport_Type" access="read">
+ </property>
+
+ </interface>
+</node>
+<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/Call_Stream_Interface_Media.xml b/spec/Call_Stream_Interface_Media.xml
index 78663a8..756ab59 100644
--- a/spec/Call_Stream_Interface_Media.xml
+++ b/spec/Call_Stream_Interface_Media.xml
@@ -96,15 +96,6 @@
</tp:docstring>
</method>
- <method name="SetSelectedCandidate"
- tp:name-for-bindings="Set_Selected_Candidate">
- <arg name="candidate"
- type="(usqa{sv})" tp:type="Candidate" direction="in">
- <tp:docstring>
- </tp:docstring>
- </arg>
- </method>
-
<tp:enum type="u" name="Stream_Transport_Type">
<tp:enumvalue suffix="Raw_UDP" value="0" />
<tp:enumvalue suffix="ICE" value="1" />
@@ -117,32 +108,6 @@
type="u" tp:type="Stream_Transport_Type" access="read">
</property>
- <tp:mapping name="Handle_Candidate_Map">
- <tp:member name="Contact" type="u" tp:type="Contact_Handle" />
- <tp:member name="Candidates" type="a(usqa{sv})" tp:type="Candidate[]" />
- </tp:mapping>
-
- <property name="RemoteCandidates" tp:name-for-bindings="Remote_Candidates"
- type="a(usqa{sv})" tp:type="Candidate[]" access="read">
- </property>
-
- <signal name="RemoteCandidatesAdded"
- tp:name-for-bindings="Remote_Candidates_Added">
- <arg name="Candidates"
- type="a(usqa{sv})" tp:type="Candidate[]"/>
- </signal>
-
- <property name="RemoteCredentials"
- tp:name-for-bindings="Remote_Credentials"
- type="ss" access="read">
- </property>
-
- <signal name="RemoteCredentialsSet"
- tp:name-for-bindings="Remote_Credentials_Set">
- <arg name="username" type="s" />
- <arg name="password" type="s" />
- </signal>
-
<property name="LocalCandidates" tp:name-for-bindings="Local_Candidates"
type="a(usqa{sv})" tp:type="Candidate[]" access="read">
</property>
@@ -163,34 +128,6 @@
<arg name="password" type="s" />
</signal>
- <property name="SelectedCandidate"
- tp:name-for-bindings="Selected_Candidate"
- type="(usqa{sv})" tp:type="Candidate" access="read">
- </property>
-
- <signal name="CandidateSelected"
- tp:name-for-bindings="Candidate_Selected">
- <arg name="Candidate"
- type="(usqa{sv})" tp:type="Candidate"/>
- </signal>
-
- <property name="StreamState" tp:name-for-bindings="Stream_State"
- type="u" tp:type="Media_Stream_Type"
- access="read">
- </property>
-
- <signal name="StreamStateChanged"
- tp:name-for-bindings="Stream_State_Changed">
- <arg name="state"
- type="u" tp:type="Media_Stream_Type"/>
- </signal>
-
- <method name="SetStreamState"
- tp:name-for-bindings="Set_Stream_State">
- <arg name="state" type="u" tp:type="Media_Stream_Type"
- direction="in" />
- </method>
-
<signal name="STUNServersAdded"
tp:name-for-bindings="STUN_Servers_Added">
<arg name="servers"
@@ -292,8 +229,21 @@
</tp:docstring>
</property>
+ <signal name="EndpointsChanged"
+ tp:name-for-bindings="Endpoints_Changed">
+ <arg name="EndpointsAdded" type="ao" />
+ <arg name="EndpointsRemoved" type="ao" />
+ </signal>
-
+ <property name="Endpoints" tp:name-for-bindings="Endpoints"
+ type="ao" access="read">
+ <p> The list of endpoints
+ <tp:dbus-ref
+ namespace="org.freedesktop.Telepathy.Call.Stream"
+ >Endpoint.Draft</tp:dbus-ref>
+ that exist for this stream.
+ </p>
+ </property>
</interface>
</node>
<!-- vim:set sw=2 sts=2 et ft=xml: -->
diff --git a/spec/all.xml b/spec/all.xml
index 98ccace..cca7aba 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -122,6 +122,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<xi:include href="Call_Content_Codec_Offer.xml"/>
<xi:include href="Call_Stream.xml"/>
<xi:include href="Call_Stream_Interface_Media.xml"/>
+ <xi:include href="Call_Stream_Endpoint.xml"/>
</tp:section>
<tp:section name="Debugging">
--
1.5.6.5
More information about the telepathy-commits
mailing list