Update to Call spec from git master

4 files changed, 57 insertions, 7 deletions

diff --git a/telepathy-yell/Call_Content.xml b/telepathy-yell/Call_Content.xml
index 82d4044..17ed710 100644
--- a/telepathy-yell/Call_Content.xml
+++ b/telepathy-yell/Call_Content.xml
@@ -116,6 +116,15 @@
       </tp:possible-errors>
     </method>
 
+    <signal name="Removed" tp:name-for-bindings="Removed">
+      <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+        <p>Emitted when the content is removed from the call. This
+          is the same as the <tp:dbus-ref
+          namespace="ofdT.Channel.Type">Call.DRAFT.ContentRemoved</tp:dbus-ref>
+          signal.</p>
+      </tp:docstring>
+    </signal>
+
     <property name="Interfaces" tp:name-for-bindings="Interfaces"
       type="as" tp:type="DBus_Interface[]" access="read" tp:immutable="yes">
       <tp:added version="0.19.11"/>
diff --git a/telepathy-yell/Call_Content_Interface_Media.xml b/telepathy-yell/Call_Content_Interface_Media.xml
index 0552111..24811fd 100644
--- a/telepathy-yell/Call_Content_Interface_Media.xml
+++ b/telepathy-yell/Call_Content_Interface_Media.xml
@@ -27,7 +27,14 @@
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       <p>Interface to use by a software implementation of media
-        streaming.</p>
+        streaming. The reason behind splitting the members of this
+        interface out from the main <tp:dbus-ref
+        namespace="ofdT.Call">Content.DRAFT</tp:dbus-ref> interface is
+        that the software is not necessarily what controls the
+        media. An example of this is in GSM phones, where the CM just
+        tells the phone to dial a number and it does the audio routing
+        in a device specific hardware way and the CM does not need
+        to concern itself with codecs.</p>
 
       <p>On new <tp:dbus-ref
         namespace="ofdT.Channel.Type">Call.DRAFT</tp:dbus-ref> channels,
diff --git a/telepathy-yell/Call_Stream.xml b/telepathy-yell/Call_Stream.xml
index b693989..1d7b281 100644
--- a/telepathy-yell/Call_Stream.xml
+++ b/telepathy-yell/Call_Stream.xml
@@ -97,7 +97,7 @@
     <signal name="RemoteMembersChanged"
         tp:name-for-bindings="Remote_Members_Changed">
       <tp:changed version="0.21.2">renamed from SendersChanged to MembersChanged</tp:changed>
-      <tp:changed version="0.21.UNRELEASED">renamed from MembersChanged to RemoteMembersChanged</tp:changed>
+      <tp:changed version="0.21.3">renamed from MembersChanged to RemoteMembersChanged</tp:changed>
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         Emitted when <tp:member-ref>RemoteMembers</tp:member-ref> changes.
       </tp:docstring>
diff --git a/telepathy-yell/Call_Stream_Interface_Media.xml b/telepathy-yell/Call_Stream_Interface_Media.xml
index 3d4fb13..5f2bbec 100644
--- a/telepathy-yell/Call_Stream_Interface_Media.xml
+++ b/telepathy-yell/Call_Stream_Interface_Media.xml
@@ -27,6 +27,26 @@
 
     <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
       [FIXME]
+
+      <h4>ICE restarts</h4>
+
+      <p>If the <tp:dbus-ref
+        namespace="ofdT.Call.Stream.Endpoint.DRAFT">RemoteCredentialsSet</tp:dbus-ref>
+        signal is fired during a call once it has been called before
+        whilst setting up the call for initial use, and the
+        credentials have changed, then there has been an ICE
+        restart. In such a case, the CM SHOULD also empty the remote
+        candidate list in the <tp:dbus-ref
+        namespace="ofdT.Call.Stream">Endpoint.DRAFT</tp:dbus-ref>.</p>
+
+      <p>If the CM does an ICE restart, then the
+        <tp:member-ref>PleaseRestartICE</tp:member-ref> signal is
+        emitted and the streaming implementation should then call
+        <tp:member-ref>SetCredentials</tp:member-ref> again.</p>
+
+      <p>For more information on ICE restarts see
+        <a href="http://tools.ietf.org/html/rfc5245#section-9.1.1.1">RFC 5245
+        section 9.1.1.1</a></p>
     </tp:docstring>
 
     <method name="SetCredentials" tp:name-for-bindings="Set_Credentials">
@@ -133,7 +153,12 @@
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         A transport that can be used for streaming.
       </tp:docstring>
-      <tp:enumvalue suffix="Raw_UDP" value="0">
+      <tp:enumvalue suffix="Unknown" value="0">
+        <tp:docstring>
+          The stream transport type is unknown or not applicable.
+        </tp:docstring>
+      </tp:enumvalue>
+      <tp:enumvalue suffix="Raw_UDP" value="1">
         <tp:docstring>
           Raw UDP, with or without STUN. All streaming clients are assumed to
           support this transport, so there is no handler capability token for
@@ -143,7 +168,7 @@
           interface.]
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="ICE" value="1">
+      <tp:enumvalue suffix="ICE" value="2">
         <tp:docstring>
           Interactive Connectivity Establishment, as defined by RFC
           5245. Note that this value covers ICE-UDP only.
@@ -151,7 +176,7 @@
           Media.StreamHandler interface.]
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="GTalk_P2P" value="2">
+      <tp:enumvalue suffix="GTalk_P2P" value="3">
         <tp:docstring>
           Google Talk peer-to-peer connectivity establishment, as implemented
           by libjingle 0.3.
@@ -159,7 +184,7 @@
           interface.]
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="WLM_2009" value="3">
+      <tp:enumvalue suffix="WLM_2009" value="4">
         <tp:docstring>
           The transport used by Windows Live Messenger 2009 or later, which
           resembles ICE draft 19.
@@ -167,7 +192,7 @@
           interface.]
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="SHM" value="4">
+      <tp:enumvalue suffix="SHM" value="5">
         <tp:added version="0.21.2"/>
         <tp:docstring>
           Shared memory transport, as implemented by the GStreamer
@@ -401,6 +426,15 @@
           <tp:member-ref>EndpointsChanged</tp:member-ref> signal.</p>
       </tp:docstring>
     </property>
+
+    <signal name="PleaseRestartICE"
+      tp:name-for-bindings="Please_Restart_ICE">
+      <tp:docstring>
+        Emitted when the CM does an ICE restart to notify the
+        streaming implementation that it should call
+        <tp:member-ref>SetCredentials</tp:member-ref> again.
+      </tp:docstring>
+    </signal>
   </interface>
 </node>
 <!-- vim:set sw=2 sts=2 et ft=xml: -->