Changes audio timeout from 2 seconds to 1

This commit is contained in:
denny
2016-02-15 16:01:06 -05:00
parent f7f6c2fc3e
commit 5573b9a9fb

View File

@@ -1,8 +1,6 @@
package audio;
/******************************************************************************* /*******************************************************************************
* SDR Trunk * SDR Trunk
* Copyright (C) 2014,2015 Dennis Sheirer * Copyright (C) 2014-2016 Dennis Sheirer
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@@ -17,6 +15,7 @@ package audio;
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/> * along with this program. If not, see <http://www.gnu.org/licenses/>
******************************************************************************/ ******************************************************************************/
package audio;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -51,7 +50,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
{ {
private static final Logger mLog = LoggerFactory.getLogger( AudioManager.class ); private static final Logger mLog = LoggerFactory.getLogger( AudioManager.class );
public static final int AUDIO_TIMEOUT = 2000; //2 seconds public static final int AUDIO_TIMEOUT = 1000; //1 second
public static final String AUDIO_CHANNELS_PROPERTY = "audio.manager.channels"; public static final String AUDIO_CHANNELS_PROPERTY = "audio.manager.channels";
public static final String AUDIO_MIXER_PROPERTY = "audio.manager.mixer"; public static final String AUDIO_MIXER_PROPERTY = "audio.manager.mixer";
@@ -433,7 +432,6 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
*/ */
public class AudioOutputConnection implements Listener<AudioEvent> public class AudioOutputConnection implements Listener<AudioEvent>
{ {
private static final long CALL_END_DELAY = 2000; //2 seconds
private static final int DISCONNECTED = -1; private static final int DISCONNECTED = -1;
private AudioOutput mAudioOutput; private AudioOutput mAudioOutput;
@@ -548,7 +546,7 @@ public class AudioManager implements Listener<AudioPacket>, IAudioController
public boolean isInactive() public boolean isInactive()
{ {
return mLastActivity != Long.MAX_VALUE && return mLastActivity != Long.MAX_VALUE &&
mLastActivity + CALL_END_DELAY < System.currentTimeMillis(); mLastActivity + AUDIO_TIMEOUT < System.currentTimeMillis();
} }
public int getPriority() public int getPriority()