From 4e9d58d926695cefc727170c9ffc4269c5a76581 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date: Wed, 15 Feb 2012 15:29:58 +0100
Subject: Remove MUTE values from call stream/channel

It is still unsure how mute should be implemented
---
 spec/Call_Stream_Interface_Media.xml | 14 +-----------
 spec/Channel_Type_Call.xml           | 42 +++++-------------------------------
 2 files changed, 6 insertions(+), 50 deletions(-)

diff --git a/spec/Call_Stream_Interface_Media.xml b/spec/Call_Stream_Interface_Media.xml
index 2e3af472..d0db6995 100644
--- a/spec/Call_Stream_Interface_Media.xml
+++ b/spec/Call_Stream_Interface_Media.xml
@@ -80,18 +80,6 @@
           data, and everything is going swimmingly.
         </tp:docstring>
       </tp:enumvalue>
-      <tp:enumvalue suffix="Pending_Mute" value="4">
-        <tp:docstring>
-          The streaming implementation has been told to mute sending,
-          but it has not yet indicated that it has done so.
-        </tp:docstring>
-      </tp:enumvalue>
-      <tp:enumvalue suffix="Muted" value="5">
-        <tp:docstring>
-          The streaming implementation has successfully muted sending,
-          and the local user's privacy is protected.
-        </tp:docstring>
-      </tp:enumvalue>
     </tp:enum>
 
     <property name="SendingState" tp:name-for-bindings="Sending_State"
@@ -102,7 +90,7 @@
         rely on reading this value and listening to
         <tp:member-ref>SendingStateChanged</tp:member-ref> to
         determine whether it should be sending media or not. It should not
-        need to listen to the Mute/Hold interfaces on the Call/Content.
+        need to listen to the Hold interfaces on the Call/Content.
         Feedback on success should be given via
         <tp:member-ref>CompleteSendingStateChange</tp:member-ref>. Failures
         should be reported via <tp:member-ref>ReportSendingFailure</tp:member-ref>.
diff --git a/spec/Channel_Type_Call.xml b/spec/Channel_Type_Call.xml
index a8beed08..7f03ea04 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
@@ -732,25 +732,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </tp:docstring>
       </tp:flag>
 
-      <tp:flag suffix="Locally_Muted" value="2">
-        <tp:docstring>
-          The call has been muted by the local user, e.g. using the
-          <tp:dbus-ref namespace="ofdT.Call1.Interface"
-          >Mute</tp:dbus-ref> interface. This flag SHOULD only
-          be set if there is at least one Content, and all Contents
-          are locally muted (for the same reason as Locally_Held).
-
-          <tp:rationale>
-            This flag exists to provide a simplified verson of <tp:dbus-ref
-            namespace="ofdT.Call1.Interface.Mute"
-              >MuteStateChanged</tp:dbus-ref>,
-            to reduce the number of signals that need to be
-            listened to by a simple UI.
-          </tp:rationale>
-        </tp:docstring>
-      </tp:flag>
-
-      <tp:flag suffix="Locally_Ringing" value="4">
+      <tp:flag suffix="Locally_Ringing" value="2">
         <tp:docstring>
           This flag exists for observability of the
           <tp:member-ref>SetRinging</tp:member-ref> method (e.g. so that
@@ -761,7 +743,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </tp:docstring>
       </tp:flag>
 
-      <tp:flag suffix="Locally_Queued" value="8">
+      <tp:flag suffix="Locally_Queued" value="4">
         <tp:docstring>
           This flag exists for observability of the
           <tp:member-ref>SetQueued</tp:member-ref> method. It should be set
@@ -771,7 +753,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </tp:docstring>
       </tp:flag>
 
-      <tp:flag suffix="Forwarded" value="16">
+      <tp:flag suffix="Forwarded" value="8">
         <tp:docstring>
           The initiator of the call originally called a contact other than the
           current recipient of the call, but the call was then forwarded or
@@ -781,7 +763,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </tp:docstring>
       </tp:flag>
 
-      <tp:flag suffix="Clearing" value="32">
+      <tp:flag suffix="Clearing" value="16">
         <tp:docstring>
           This flag only occurs when the CallState is Ended. The call with
           this flag set has ended, but not all resources corresponding to the
@@ -1216,21 +1198,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
         </tp:docstring>
       </tp:flag>
 
-      <tp:flag suffix="Muted" value="4">
-        <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
-          <p>The call member has muted their participation in this call. Note
-            that many protocols will not signal this flag, so clients should
-            not rely on it being set.</p>
-
-          <tp:rationale>
-            <p>This is a flag per member, not a flag for the call as a whole,
-              because in conference calls, any member could mute their own
-              streams.</p>
-          </tp:rationale>
-        </tp:docstring>
-      </tp:flag>
-
-      <tp:flag suffix="Conference_Host" value="8">
+      <tp:flag suffix="Conference_Host" value="4">
         <tp:docstring xmlns="http://www.w3.org/1999/xhtml">
           This contact has merged this call into a conference. Note that GSM
           provides a notification when the remote party merges a call into a
-- 
cgit v1.2.3