Skip to content
Snippets Groups Projects
Commit 6d2ea096 authored by Vincent Lucas's avatar Vincent Lucas
Browse files

Reverts commits 10201 and 10202: Adds a...

Reverts commits 10201 and 10202: Adds a net.java.sip.communicator.impl.neomedia.device.hideDevicelessAudioSystems property (default=true) to give the possibility to show deviceless audio systems (if this property is set to false in the configuration).
parent 05318951
No related branches found
No related tags found
No related merge requests found
......@@ -148,15 +148,6 @@ public class DeviceConfiguration
public static final String PROP_AUDIO_SYSTEM_DEVICES
= PROP_AUDIO_SYSTEM + "." + DeviceSystem.PROP_DEVICES;
/**
* The name of the <tt>ConfigurationService</tt> <tt>boolean</tt> property
* which indicates whether the <tt>AudioSystem</tt>s without devices should
* be hidden from display i.e. should not be displayed to the user. The
* default value is <tt>true</tt>.
*/
private static final String PROP_HIDE_DEVICELESS_AUDIO_SYSTEMS
= "net.java.sip.communicator.impl.neomedia.device.hideDevicelessAudioSystems";
/**
* The <tt>ConfigurationService</tt> property which stores the device used
* by <tt>DeviceConfiguration</tt> for video capture.
......@@ -444,28 +435,16 @@ public AudioSystem getAudioSystem()
/**
* Returns a list of available <tt>AudioSystem</tt>s. By default, an
* <tt>AudioSystem</tt> is considered available if it reports at least one
* device. The default behavior may be overridden i.e. the
* <tt>AudioSystem</tt>s without any devices may be reported by setting the
* <tt>ConfigurationService</tt> property with the name
* {@link #PROP_HIDE_DEVICELESS_AUDIO_SYSTEMS} to the <tt>boolean</tt> value
* <tt>false</tt>.
* device.
*
* @return an array of available <tt>AudioSystem</tt>s
*/
public AudioSystem[] getAvailableAudioSystems()
{
AudioSystem[] audioSystems = AudioSystem.getAudioSystems();
ConfigurationService cfg;
if ((audioSystems == null)
|| (audioSystems.length == 0)
|| (((cfg = LibJitsi.getConfigurationService()) != null)
&& !cfg.getBoolean(
PROP_HIDE_DEVICELESS_AUDIO_SYSTEMS,
true)))
{
if ((audioSystems == null) || (audioSystems.length == 0))
return audioSystems;
}
else
{
List<AudioSystem> audioSystemsWithDevices
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment