diff options
3 files changed, 24 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/impl/neomedia/device/DirectShowAuto.java b/src/net/java/sip/communicator/impl/neomedia/device/DirectShowAuto.java index 45149c5..972a870 100644 --- a/src/net/java/sip/communicator/impl/neomedia/device/DirectShowAuto.java +++ b/src/net/java/sip/communicator/impl/neomedia/device/DirectShowAuto.java @@ -41,6 +41,9 @@ public class DirectShowAuto */
public DirectShowAuto() throws Exception
{
+ if(logger.isInfoEnabled())
+ logger.info("Start detecting DirectShow capture devices");
+
DSManager manager = DSManager.getInstance();
DSCaptureDevice devices[] = null;
boolean captureDeviceInfoIsAdded = false;
@@ -80,6 +83,9 @@ public class DirectShowAuto format,
});
+ if(logger.isInfoEnabled())
+ logger.info("Found[" + i + "]: " + device.getName());
+
CaptureDeviceManager.addDevice(device);
captureDeviceInfoIsAdded = true;
}
@@ -89,6 +95,9 @@ public class DirectShowAuto devices = null;
DSManager.dispose();
+
+ if(logger.isInfoEnabled())
+ logger.info("Finish detecting DirectShow capture devices");
}
}
diff --git a/src/net/java/sip/communicator/impl/neomedia/device/FMJCivilVideoAuto.java b/src/net/java/sip/communicator/impl/neomedia/device/FMJCivilVideoAuto.java index d2788a2..a9dd23e 100644 --- a/src/net/java/sip/communicator/impl/neomedia/device/FMJCivilVideoAuto.java +++ b/src/net/java/sip/communicator/impl/neomedia/device/FMJCivilVideoAuto.java @@ -7,6 +7,7 @@ package net.java.sip.communicator.impl.neomedia.device; import java.lang.reflect.*; +import net.java.sip.communicator.util.*; /** * FMJ auto-detect of CIVIL video capture devices. @@ -16,6 +17,13 @@ import java.lang.reflect.*; public class FMJCivilVideoAuto { /** + * The <tt>Logger</tt> used by the <tt>FMJCivilVideoAuto</tt> class and its + * instances for logging output. + */ + private static final Logger logger + = Logger.getLogger(FMJCivilVideoAuto.class); + + /** * Creates an instance of FMJCivilVideoAuto and auto-detects CIVIL video * capture devices. * @@ -24,6 +32,9 @@ public class FMJCivilVideoAuto */ public FMJCivilVideoAuto() throws Exception { + if(logger.isInfoEnabled()) + logger.info("Start detecting Civil Capture Devices"); + // Done using reflection to avoid compile-time dependency on FMJ: //new net.sf.fmj.media.cdp.civil.CaptureDevicePlugger().addCaptureDevices(); final Class<?> clazz @@ -31,5 +42,8 @@ public class FMJCivilVideoAuto final Method addCaptureDevices = clazz.getMethod("addCaptureDevices"); final Object captureDevicePlugger = clazz.newInstance(); addCaptureDevices.invoke(captureDevicePlugger); + + if(logger.isInfoEnabled()) + logger.info("Finish detecting Civil Capture Devices"); } } diff --git a/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java b/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java index dae13fe..a1e6ad6 100644 --- a/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java +++ b/src/net/java/sip/communicator/impl/shutdowntimeout/ShutdownTimeout.java @@ -78,7 +78,7 @@ public class ShutdownTimeout + SHUTDOWN_TIMEOUT + "ms."); wait(SHUTDOWN_TIMEOUT); logger.error("Failed to gently shutdown. Forcing exit."); - System.exit(500); + System.exit(SYSTEM_EXIT_CODE); }catch (InterruptedException ex){ if (logger.isDebugEnabled()) logger.debug("Interrupted shutdown timer."); |