From 19cc5b8bcc8f7b7cdb82041a86d347eddbc4714f Mon Sep 17 00:00:00 2001
From: Vincent Lucas <chenzo@jitsi.org>
Date: Fri, 21 Dec 2012 13:03:45 +0000
Subject: [PATCH] Creates a property named
org.jitsi.impl.neomadia.device.disableUsbDeviceAutoSelection in order to
disable the automatic selection of USB audio devices (if set to true).
---
.../jitsi/impl/neomedia/device/Devices.java | 25 ++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/src/org/jitsi/impl/neomedia/device/Devices.java b/src/org/jitsi/impl/neomedia/device/Devices.java
index 3e6794f2..d94354b8 100644
--- a/src/org/jitsi/impl/neomedia/device/Devices.java
+++ b/src/org/jitsi/impl/neomedia/device/Devices.java
@@ -20,6 +20,14 @@
*/
public abstract class Devices
{
+ /**
+ * The name of the <tt>ConfigurationService</tt> <tt>boolean</tt> property
+ * which indicates whether the automatic selection of USB devices must be
+ * disabled. The default value is <tt>false</tt>.
+ */
+ private static final String PROP_DISABLE_USB_DEVICE_AUTO_SELECTION
+ = "org.jitsi.impl.neomadia.device.disableUsbDeviceAutoSelection";
+
/**
* The audio system managing this device list.
*/
@@ -75,6 +83,21 @@ public ExtendedCaptureDeviceInfo getDevice(
if(!devicePreferences.contains(
activeDevice.getModelIdentifier()))
{
+ // By default, select automatically the USB devices.
+ boolean isSelected
+ = activeDevice.isSameTransportType("USB");
+ ConfigurationService cfg
+ = LibJitsi.getConfigurationService();
+ // Desactivate the USB device automatic selection if the
+ // property is set to true.
+ if(cfg != null
+ && cfg.getBoolean(
+ PROP_DISABLE_USB_DEVICE_AUTO_SELECTION,
+ false))
+ {
+ isSelected = false;
+ }
+
// Adds the device in the preference list (to the end of the
// list, but the save device will push it to the top of
// active devices).
@@ -83,7 +106,7 @@ public ExtendedCaptureDeviceInfo getDevice(
property,
activeDevice,
activeDevices,
- activeDevice.isSameTransportType("USB"));
+ isSelected);
}
}
--
GitLab