From c08989bb95549d5371d62850694478f202c91686 Mon Sep 17 00:00:00 2001
From: Lyubomir Marinov <lyubomir.marinov@jitsi.org>
Date: Fri, 23 Dec 2011 22:34:49 +0000
Subject: Fixes '[jitsi-dev] Jitsi build 3846 adds one more set of input
 devices to the audio options on each start (Linux 32-bit)' reported by
 Kertesz Laszlo on the dev mailing list.

---
 .../communicator/impl/neomedia/MediaStreamImpl.java    |  4 ----
 .../communicator/impl/neomedia/NeomediaActivator.java  | 11 +++++++++++
 .../communicator/service/neomedia/StreamConnector.java | 18 +++++++++---------
 3 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'src/net/java')

diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
index 1928fdd..2b8e720 100644
--- a/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
+++ b/src/net/java/sip/communicator/impl/neomedia/MediaStreamImpl.java
@@ -1274,9 +1274,7 @@ public class MediaStreamImpl
                         = super.createDataOutputStream();
 
                     if (dataOutputStream != null)
-                    {
                         configureDataOutputStream(dataOutputStream);
-                    }
                     return dataOutputStream;
                 }
 
@@ -1288,9 +1286,7 @@ public class MediaStreamImpl
                         = super.createDataInputStream();
 
                     if (dataInputStream != null)
-                    {
                         configureDataInputStream(dataInputStream);
-                    }
                     return dataInputStream;
                 }
             };
diff --git a/src/net/java/sip/communicator/impl/neomedia/NeomediaActivator.java b/src/net/java/sip/communicator/impl/neomedia/NeomediaActivator.java
index f9d5d53..3fa9561 100644
--- a/src/net/java/sip/communicator/impl/neomedia/NeomediaActivator.java
+++ b/src/net/java/sip/communicator/impl/neomedia/NeomediaActivator.java
@@ -125,6 +125,17 @@ public class NeomediaActivator
          */
         Registry.set("allowLogging", logger.isDebugEnabled());
 
+        /*
+         * Disable the loading of .fmj.registry because Kertesz Laszlo has
+         * reported that audio input devices duplicate after restarting Jitsi.
+         * Besides, Jitsi does not really need .fmj.registry on startup.
+         */
+        String jmfRegistryDisableLoad
+            = "net.sf.fmj.utility.JmfRegistry.disableLoad";
+
+        if (System.getProperty(jmfRegistryDisableLoad) == null)
+            System.setProperty(jmfRegistryDisableLoad, "true");
+
         String scHomeDirLocation
             = System.getProperty(
                 ConfigurationService.PNAME_SC_HOME_DIR_LOCATION);
diff --git a/src/net/java/sip/communicator/service/neomedia/StreamConnector.java b/src/net/java/sip/communicator/service/neomedia/StreamConnector.java
index 007f91c..027bb2d 100644
--- a/src/net/java/sip/communicator/service/neomedia/StreamConnector.java
+++ b/src/net/java/sip/communicator/service/neomedia/StreamConnector.java
@@ -22,7 +22,7 @@ import java.net.*;
 public interface StreamConnector
 {
     /**
-     * Enumeration of supported protocols.
+     * Enumerates the protocols supported by <tt>StreamConnector</tt>.
      */
     public enum Protocol
     {
@@ -42,8 +42,8 @@ public interface StreamConnector
      * use for data (e.g. RTP) traffic.
      *
      * @return a reference to the <tt>DatagramSocket</tt> that a stream should
-     * use for data (e.g. RTP) traffic or null if this <tt>StreamConnector</tt>
-     * does not handle UDP sockets.
+     * use for data (e.g. RTP) traffic or <tt>null</tt> if this
+     * <tt>StreamConnector</tt> does not handle UDP sockets.
      */
     public DatagramSocket getDataSocket();
 
@@ -52,8 +52,8 @@ public interface StreamConnector
      * use for control data (e.g. RTCP).
      *
      * @return a reference to the <tt>DatagramSocket</tt> that a stream should
-     * use for control data (e.g. RTCP) or null if this <tt>StreamConnector</tt>
-     * does not handle UDP sockets.
+     * use for control data (e.g. RTCP) or <tt>null</tt> if this
+     * <tt>StreamConnector</tt> does not handle UDP sockets.
      */
     public DatagramSocket getControlSocket();
 
@@ -62,8 +62,8 @@ public interface StreamConnector
      * use for data (e.g. RTP) traffic.
      *
      * @return a reference to the <tt>Socket</tt> that a stream should
-     * use for data (e.g. RTP) traffic or null if this <tt>StreamConnector</tt>
-     * does not handle TCP sockets.
+     * use for data (e.g. RTP) traffic or <tt>null</tt> if this
+     * <tt>StreamConnector</tt> does not handle TCP sockets.
      */
     public Socket getDataTCPSocket();
 
@@ -72,8 +72,8 @@ public interface StreamConnector
      * use for control data (e.g. RTCP).
      *
      * @return a reference to the <tt>Socket</tt> that a stream should
-     * use for control data (e.g. RTCP) or null if this <tt>StreamConnector</tt>
-     * does not handle TCP sockets.
+     * use for control data (e.g. RTCP) or <tt>null</tt> if this
+     * <tt>StreamConnector</tt> does not handle TCP sockets.
      */
     public Socket getControlTCPSocket();
 
-- 
cgit v1.1