Merge pull request #180 from DSheirer/166-traffic_channel_manager_cleanup

Resolves #166 - removes traffic channel timeout from traffic channel manager
This commit is contained in:
Denny Sheirer
2017-02-10 15:31:24 +00:00
committed by GitHub
2 changed files with 2 additions and 10 deletions

View File

@@ -84,8 +84,6 @@ public class TrafficChannelManager extends Module implements ICallEventProvider,
* @param system label to use to describe the system * @param system label to use to describe the system
* @param site label to use to describe the site * @param site label to use to describe the site
* @param aliasListName designated for the channel * @param aliasListName designated for the channel
* @param trafficChannelTimeout - millisecond call timer limit used when an
* end of call signalling event is not decoded.
* @param trafficChannelPoolSize - maximum number of allocated traffic channels * @param trafficChannelPoolSize - maximum number of allocated traffic channels
* in the pool * in the pool
*/ */
@@ -96,7 +94,6 @@ public class TrafficChannelManager extends Module implements ICallEventProvider,
String system, String system,
String site, String site,
String aliasListName, String aliasListName,
long trafficChannelTimeout,
int trafficChannelPoolSize) int trafficChannelPoolSize)
{ {
mChannelModel = channelModel; mChannelModel = channelModel;

View File

@@ -222,11 +222,9 @@ public class DecoderFactory
if(channelType == ChannelType.STANDARD) if(channelType == ChannelType.STANDARD)
{ {
long timeout = mptConfig.getCallTimeout() * 1000; //convert to milliseconds
modules.add(new TrafficChannelManager(channelModel, channelProcessingManager, decodeConfig, modules.add(new TrafficChannelManager(channelModel, channelProcessingManager, decodeConfig,
channel.getRecordConfiguration(), channel.getSystem(), channel.getSite(), channel.getRecordConfiguration(), channel.getSystem(), channel.getSite(),
(aliasList != null ? aliasList.getName() : null), timeout, mptConfig.getTrafficChannelPoolSize())); (aliasList != null ? aliasList.getName() : null), mptConfig.getTrafficChannelPoolSize()));
} }
modules.add(new FMDemodulatorModule(iqPass, iqStop)); modules.add(new FMDemodulatorModule(iqPass, iqStop));
@@ -264,12 +262,9 @@ public class DecoderFactory
if(channelType == ChannelType.STANDARD) if(channelType == ChannelType.STANDARD)
{ {
//Set call timeout to 3 seconds for P25 traffic channels
long timeout = 3000;
modules.add(new TrafficChannelManager(channelModel, channelProcessingManager, decodeConfig, modules.add(new TrafficChannelManager(channelModel, channelProcessingManager, decodeConfig,
channel.getRecordConfiguration(), channel.getSystem(), channel.getSite(), channel.getRecordConfiguration(), channel.getSystem(), channel.getSite(),
(aliasList != null ? aliasList.getName() : null), timeout, p25Config.getTrafficChannelPoolSize())); (aliasList != null ? aliasList.getName() : null), p25Config.getTrafficChannelPoolSize()));
} }
modules.add(new P25AudioModule(metadata)); modules.add(new P25AudioModule(metadata));