diff options
| author | Sebastien Vincent <seb@jitsi.org> | 2011-05-20 15:26:33 +0000 |
|---|---|---|
| committer | Sebastien Vincent <seb@jitsi.org> | 2011-05-20 15:26:33 +0000 |
| commit | c65785209f07c9dde145b3dfa305783821d043d6 (patch) | |
| tree | 21f3658816fdf4bfdd4240f614889051b4f17a11 /src/net/java/sip/communicator/service/protocol/media | |
| parent | 400f019e34c76aacfb0621cabe1959b0606e87b9 (diff) | |
| download | jitsi-c65785209f07c9dde145b3dfa305783821d043d6.zip jitsi-c65785209f07c9dde145b3dfa305783821d043d6.tar.gz jitsi-c65785209f07c9dde145b3dfa305783821d043d6.tar.bz2 | |
Commits work in progress on Google Talk voice support.
Diffstat (limited to 'src/net/java/sip/communicator/service/protocol/media')
| -rw-r--r-- | src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java | 2 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/service/protocol/media/MediaAwareCall.java | 10 |
2 files changed, 11 insertions, 1 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 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 <tt>Call</tt> * is currently allowed. The setting does not reflect the availability of * actual video capture devices, it just expresses the local policy (or |