diff options
author | Boris Grozev <boris@jitsi.org> | 2013-07-26 10:39:58 +0300 |
---|---|---|
committer | Boris Grozev <boris@jitsi.org> | 2013-07-26 16:47:36 +0300 |
commit | e8738c1e05da7198c36f4c0a68654375f3a88e1c (patch) | |
tree | 01efc36725f8dcfcc377f74d98ca46c631970167 /src/net/java/sip/communicator/service | |
parent | a4e091b2c27f0f12b9ffa9fd1cba6e088f242fa4 (diff) | |
download | jitsi-e8738c1e05da7198c36f4c0a68654375f3a88e1c.zip jitsi-e8738c1e05da7198c36f4c0a68654375f3a88e1c.tar.gz jitsi-e8738c1e05da7198c36f4c0a68654375f3a88e1c.tar.bz2 |
Uses the 'on-hold' endpoint status type when describing in a conference-info document CallPeer-s which have a REMOTELY_ON_HOLD status.
Diffstat (limited to 'src/net/java/sip/communicator/service')
-rw-r--r-- | src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java index 00a9d10..85a0288 100644 --- a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java +++ b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java @@ -1170,6 +1170,17 @@ public abstract class AbstractOperationSetTelephonyConferencing< return ConferenceInfoDocument.EndpointStatusType.dialing_out; /* + * RFC4575 does not list an appropriate endpoint status for + * "remotely on hold", e.g. the endpoint is not "hearing" the conference + * mix, but it's media stream *is* being mixed into the conference. + * + * We use the on-hold status anyway, because it's the one that makes + * the most sense. + */ + if (CallPeerState.ON_HOLD_REMOTELY.equals(callPeerState)) + return ConferenceInfoDocument.EndpointStatusType.on_hold; + + /* * he/she is neither "hearing" the conference mix nor is his/her * media being mixed in the conference */ |