From 6c2a8919d2f91a435d5ac82eea7f9d9d17a709c8 Mon Sep 17 00:00:00 2001 From: Lyubomir Marinov Date: Sat, 17 Dec 2011 18:55:22 +0000 Subject: Switches from JMF to FMJ. --- .../service/protocol/media/MediaAwareCall.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/net/java/sip/communicator/service/protocol') 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; } -- cgit v1.1