[next] telepathy-spec: Split UI and Media aspects of the Call1 API

[Simon McVittie]

Module: telepathy-spec
Branch: next
Commit: 6dd7f93afa2dd6509923eae79ca555814cda21e7
URL:    http://cgit.freedesktop.org/telepathy/telepathy-spec/commit/?id=6dd7f93afa2dd6509923eae79ca555814cda21e7

Author: Olivier Crête <olivier.crete at collabora.com>
Date:   Mon Mar 26 13:07:13 2012 -0400

Split UI and Media aspects of the Call1 API

---

 spec/all.xml |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/spec/all.xml b/spec/all.xml
index aab1865..393f3c8 100644
--- a/spec/all.xml
+++ b/spec/all.xml
@@ -240,9 +240,21 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
 
  <tp:section name="Calls">
    <xi:include href="Call_Content.xml"/>
-   <xi:include href="Call_Content_Interface_Media.xml"/>
-   <xi:include href="Call_Interface_Mute.xml"/>
    <xi:include href="Call_Content_Interface_DTMF.xml"/>
+   <xi:include href="Call_Stream.xml"/>
+   <xi:include href="Call_Interface_Mute.xml"/>
+ </tp:section>
+ <tp:section name="Calls Media">
+   <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+     <p>
+       These interfaces are used when a <tp:dbus-ref
+       namespace='ofdT.Channel.Type'>Call1</tp:dbus-ref> channel
+       doesn't have <tp:dbus-ref
+       namespace="ofdT.Channel.Type.Call1">HardwareStreaming</tp:dbus-ref> to
+       implement the media streaming aspects of a call.
+     </p>
+   </tp:docstring>
+   <xi:include href="Call_Content_Interface_Media.xml"/>
    <xi:include href="Call_Content_Interface_Video_Control.xml"/>
    <xi:include href="Call_Content_Interface_Audio_Control.xml"/>
    <xi:include href="Call_Content_Media_Description.xml"/>
@@ -250,7 +262,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
    <xi:include href="Call_Content_Media_Description_Interface_RTCP_Feedback.xml"/>
    <xi:include
    href="Call_Content_Media_Description_Interface_RTCP_Extended_Reports.xml"/>
-   <xi:include href="Call_Stream.xml"/>
    <xi:include href="Call_Stream_Interface_Media.xml"/>
    <xi:include href="Call_Stream_Endpoint.xml"/>
  </tp:section>