From b6791d6ca16f25b332a4ce68a77102a8219e9335 Mon Sep 17 00:00:00 2001 From: Ken Larson Date: Thu, 24 Apr 2008 21:11:15 +0000 Subject: [PATCH] more FMJ conditionals - use FMJ alaw codecs which have no internal ibm dependency. Also, catch throwable when constructing codecs to handle class not found exceptions --- .../java/sip/communicator/impl/media/MediaControl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/net/java/sip/communicator/impl/media/MediaControl.java b/src/net/java/sip/communicator/impl/media/MediaControl.java index d3f8fded6..74c0bca11 100644 --- a/src/net/java/sip/communicator/impl/media/MediaControl.java +++ b/src/net/java/sip/communicator/impl/media/MediaControl.java @@ -137,8 +137,12 @@ public class MediaControl */ private static String[] customCodecs = new String[] { - "net.java.sip.communicator.impl.media.codec.audio.alaw.JavaEncoder", - "net.java.sip.communicator.impl.media.codec.audio.alaw.DePacketizer", + FMJConditionals.FMJ_CODECS + ? "net.sf.fmj.media.codec.audio.alaw.Encoder" + : "net.java.sip.communicator.impl.media.codec.audio.alaw.JavaEncoder", + FMJConditionals.FMJ_CODECS + ? "net.sf.fmj.media.codec.audio.alaw.DePacketizer" + : "net.java.sip.communicator.impl.media.codec.audio.alaw.DePacketizer", FMJConditionals.FMJ_CODECS ? "net.sf.fmj.media.codec.audio.alaw.Packetizer" : "net.java.sip.communicator.impl.media.codec.audio.alaw.Packetizer", @@ -1128,7 +1132,7 @@ private void registerCustomCodecs() logger.debug("Codec : " + className + " is succsefully registered : " + result); } - catch (Exception ex) + catch (Throwable ex) { logger.debug("Codec : " + className + " is NOT succsefully registered");