summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.co.uk>2012-02-15 15:29:58 +0100
committerXavier Claessens <xavier.claessens@collabora.co.uk>2012-02-15 15:29:58 +0100
commit4c651366bc34ae6aab83d77e0b5f8f61f2163442 (patch)
tree4faed5d099bea39c7cf869b15a3e5e0decfcf9cc
parent49a70f85af9f997478be9fdb8e8b1667485c6e71 (diff)
Remove MUTE values from call stream/channel
It is still unsure how mute should be implemented
-rw-r--r--spec/Call_Stream_Interface_Media.xml14
-rw-r--r--spec/Channel_Type_Call.xml32
2 files changed, 1 insertions, 45 deletions
diff --git a/spec/Call_Stream_Interface_Media.xml b/spec/Call_Stream_Interface_Media.xml
index 06c24ff4..3c9a0959 100644
--- a/spec/Call_Stream_Interface_Media.xml
+++ b/spec/Call_Stream_Interface_Media.xml
@@ -79,18 +79,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"
@@ -101,7 +89,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 d151988a..e899b298 100644
--- a/spec/Channel_Type_Call.xml
+++ b/spec/Channel_Type_Call.xml
@@ -731,24 +731,6 @@ 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:docstring>
This flag exists for observability of the
@@ -1215,20 +1197,6 @@ 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:docstring xmlns="http://www.w3.org/1999/xhtml">
This contact has merged this call into a conference. Note that GSM