From fa6a2fc8da60e65823e44ca8b30dfb6593c9316c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.co.uk>
Date: Sun, 31 Oct 2010 16:11:42 +0000
Subject: [PATCH] Have only one CodecOffer at a time and one Contact per CodecOffer

---
 spec/Call_Content_Interface_Media.xml |   40 +++++++++++---------------------
 1 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/spec/Call_Content_Interface_Media.xml b/spec/Call_Content_Interface_Media.xml
index a22e3ba..52e5227 100644
--- a/spec/Call_Content_Interface_Media.xml
+++ b/spec/Call_Content_Interface_Media.xml
@@ -43,7 +43,7 @@
         appears, whether it was requested or not, one or more <tp:dbus-ref
         namespace="ofdT.Call.Content">CodecOffer.DRAFT</tp:dbus-ref>
         objects will either be waiting in the
-        <tp:member-ref>CodecOffers</tp:member-ref> mapping, or will
+        <tp:member-ref>CodecOffer</tp:member-ref> mapping, or will
         appear at some point via the
         <tp:member-ref>NewCodecOffer</tp:member-ref> signal.</p>
 
@@ -174,8 +174,13 @@
           >CodecOffer.DRAFT</tp:dbus-ref>
         </tp:docstring>
       </tp:member>
-      <tp:member name="Remote_Contact_Codec_Map" type="a{ua(usuua{ss})}"
-          tp:type="Contact_Codec_Map">
+      <tp:member name="Remote_Contact" type="u" tp:type="Contact_Handle">
+        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
+          The contact handle that this codec offer applies to.
+        </tp:docstring>
+      </tp:member>
+      <tp:member name="Remote_Contact_Codecs" type="a(usuua{ss})"
+          tp:type="Codec[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           The <tp:dbus-ref namespace="ofdT.Call.Content"
           >CodecOffer.DRAFT.RemoteContactCodecs</tp:dbus-ref> property
@@ -190,7 +195,7 @@
 
         <p>As well as acting as change notification for the
           <tp:member-ref>ContactCodecMap</tp:member-ref>, emission of this
-          signal implies that the <tp:member-ref>CodecOffers</tp:member-ref>
+          signal implies that the <tp:member-ref>CodecOffer</tp:member-ref>
           property has changed to the empty list.</p>
       </tp:docstring>
       <arg name="Updated_Codecs" type="a{ua(usuua{ss})}"
@@ -228,7 +233,7 @@
             Raised when a <tp:dbus-ref
             namespace="ofdT.Call.Content">CodecOffer.DRAFT</tp:dbus-ref>
             object exists and is referred to in the
-            <tp:member-ref>CodecOffers</tp:member-ref> property which
+            <tp:member-ref>CodecOffer</tp:member-ref> property which
             should be used instead of calling this method, or before
             the content's initial <tp:dbus-ref
             namespace="ofdT.Call.Content">CodecOffer.DRAFT</tp:dbus-ref>
@@ -261,7 +266,7 @@
 
         <p>Emission of this signal indicates that the a new (Contact,
           Offer, Codecs) element has been added to the
-          <tp:member-ref>CodecOffers</tp:member-ref> property.</p>
+          <tp:member-ref>CodecOffer</tp:member-ref> property.</p>
       </tp:docstring>
       <arg name="Contact" type="u">
         <tp:docstring>
@@ -274,7 +279,7 @@
           codec offer.
         </tp:docstring>
       </arg>
-      <arg name="Codecs" type="a{ua(usuua{ss})}" tp:type="Contact_Codec_Map">
+      <arg name="Codecs" type="a(usuua{ss})" tp:type="Codec[]">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           <p>The <tp:dbus-ref namespace="ofdT.Call.Content"
             >CodecOffer.DRAFT.RemoteContactCodecs</tp:dbus-ref> property
@@ -291,25 +296,8 @@
       </arg>
     </signal>
 
-    <tp:mapping name="Contact_Codec_Offering_Map">
-      <tp:docstring>
-        A map from contact to codec offering.
-      </tp:docstring>
-      <tp:member name="Handle" type="u" tp:type="Contact_Handle">
-        <tp:docstring>
-          A contact handle.
-        </tp:docstring>
-      </tp:member>
-      <tp:member name="Codec_Offering" type="(oa{ua(usuua{ss})})"
-        tp:type="Codec_Offering[]">
-        <tp:docstring>
-          The codec offering for the contact.
-        </tp:docstring>
-      </tp:member>
-    </tp:mapping>
-
-    <property name="CodecOffers" tp:name-for-bindings="Codec_Offers"
-      type="a{u(oa{ua(usuua{ss})})}" tp:type="Contact_Codec_Offering_Map"
+    <property name="CodecOffer" tp:name-for-bindings="Codec_Offer"
+      type="(oua(usuua{ss}))" tp:type="Codec_Offering"
       access="read">
       <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
         <p>The object path to the current
-- 
1.7.2.3