From c65785209f07c9dde145b3dfa305783821d043d6 Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Fri, 20 May 2011 15:26:33 +0000 Subject: Commits work in progress on Google Talk voice support. --- .../media/AbstractOperationSetTelephonyConferencing.java | 2 +- .../communicator/service/protocol/media/MediaAwareCall.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src/net/java/sip/communicator/service/protocol/media') 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 2095fee..4d6fc4e 100644 --- a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java +++ b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java @@ -245,7 +245,7 @@ public abstract class AbstractOperationSetTelephonyConferencing< * @throws OperationFailedException if inviting the specified callee to the * specified call fails */ - protected abstract MediaAwareCallPeerT inviteCalleeToCall( + protected abstract CallPeer inviteCalleeToCall( CalleeAddressT calleeAddress, MediaAwareCallT call, boolean wasConferenceFocus) 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 d5ac2c0..d3b1261 100644 --- a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCall.java +++ b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCall.java @@ -520,6 +520,16 @@ public abstract class MediaAwareCall< } /** + * Get the media use case. + * + * @return media use case + */ + public MediaUseCase getMediaUseCase() + { + return mediaUseCase; + } + + /** * Determines whether the streaming of local video in this Call * is currently allowed. The setting does not reflect the availability of * actual video capture devices, it just expresses the local policy (or -- cgit v1.1