diff options
| author | Yana Stamcheva <yana@jitsi.org> | 2010-11-07 19:00:37 +0000 |
|---|---|---|
| committer | Yana Stamcheva <yana@jitsi.org> | 2010-11-07 19:00:37 +0000 |
| commit | baea06ffedf852b7b6181c9afcd959a0bc0a2227 (patch) | |
| tree | 4fea4dbbfc3225d338be19de7fdfa0ca20382e62 /src/net/java/sip/communicator/service | |
| parent | 5e6ebdca849eb862cd23c671669a5e9f39909f74 (diff) | |
| download | jitsi-baea06ffedf852b7b6181c9afcd959a0bc0a2227.zip jitsi-baea06ffedf852b7b6181c9afcd959a0bc0a2227.tar.gz jitsi-baea06ffedf852b7b6181c9afcd959a0bc0a2227.tar.bz2 | |
Desktop Sharing: manage enabling/disabling local video and desktop sharing.
Diffstat (limited to 'src/net/java/sip/communicator/service')
| -rw-r--r-- | src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetVideoTelephony.java | 2 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/service/protocol/media/MediaAwareCall.java | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetVideoTelephony.java b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetVideoTelephony.java index 05edb58..5a9fc90 100644 --- a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetVideoTelephony.java +++ b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetVideoTelephony.java @@ -188,7 +188,7 @@ public abstract class AbstractOperationSetVideoTelephony< @SuppressWarnings("unchecked") // work with MediaAware* in media package public boolean isLocalVideoAllowed(Call call) { - return ((V)call).isLocalVideoAllowed(); + return ((V)call).isLocalVideoAllowed(MediaUseCase.CALL); } /** diff --git a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCall.java b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCall.java index 8fc179c..07e5036 100644 --- a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCall.java +++ b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCall.java @@ -529,12 +529,17 @@ public abstract class MediaAwareCall< * desire of the user) to have the local video streamed in the case the * system is actually able to do so. * + * @param useCase the use case of the video (i.e video call or desktop + * streaming/sharing session) * @return <tt>true</tt> if the streaming of local video for this * <tt>Call</tt> is allowed; otherwise, <tt>false</tt> */ - public boolean isLocalVideoAllowed() + public boolean isLocalVideoAllowed(MediaUseCase useCase) { - return localVideoAllowed; + if (mediaUseCase.equals(useCase)) + return localVideoAllowed; + else + return false; } /** |