diff options
| author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2011-12-17 18:55:22 +0000 |
|---|---|---|
| committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2011-12-17 18:55:22 +0000 |
| commit | 6c2a8919d2f91a435d5ac82eea7f9d9d17a709c8 (patch) | |
| tree | 0b927f1d4f8393b240e811a80d97ade8a69faf8f /src/net/java/sip/communicator/service | |
| parent | 3d4463838b8d946f4171ce678f6f8ab5f5ac697c (diff) | |
| download | jitsi-6c2a8919d2f91a435d5ac82eea7f9d9d17a709c8.zip jitsi-6c2a8919d2f91a435d5ac82eea7f9d9d17a709c8.tar.gz jitsi-6c2a8919d2f91a435d5ac82eea7f9d9d17a709c8.tar.bz2 | |
Switches from JMF to FMJ.
Diffstat (limited to 'src/net/java/sip/communicator/service')
| -rw-r--r-- | src/net/java/sip/communicator/service/protocol/media/MediaAwareCall.java | 14 |
1 files changed, 8 insertions, 6 deletions
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 3fa9add..9e2bb3b 100644 --- a/src/net/java/sip/communicator/service/protocol/media/MediaAwareCall.java +++ b/src/net/java/sip/communicator/service/protocol/media/MediaAwareCall.java @@ -388,15 +388,17 @@ public abstract class MediaAwareCall< if(device == null) device = mediaService.getDefaultDevice(mediaType, mediaUseCase); + /* + * Make sure that the audio device has an AudioMixer in order to support + * conferencing and call recording. + */ if (MediaType.AUDIO.equals(mediaType)) { - if (conferenceAudioMixer == null) - { - if (device != null) - conferenceAudioMixer = mediaService.createMixer(device); - } - return conferenceAudioMixer; + if ((conferenceAudioMixer == null) && (device != null)) + conferenceAudioMixer = mediaService.createMixer(device); + device = conferenceAudioMixer; } + return device; } |