This commit is contained in:
denny
2016-02-13 13:59:10 -05:00
parent 37a93c8884
commit 5071205e73
2 changed files with 20 additions and 2 deletions

View File

@@ -210,7 +210,6 @@ 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, modules.add( new TrafficChannelManager( channelModel, channelProcessingManager,
decodeConfig, recordConfig, channel.getSystem(), decodeConfig, recordConfig, channel.getSystem(),
@@ -256,7 +255,7 @@ public class DecoderFactory
if( channelType == ChannelType.STANDARD ) if( channelType == ChannelType.STANDARD )
{ {
//Set call timeout to 3 seconds for P25 traffic channels //Set call timeout to 3 seconds for P25 traffic channels
long timeout = 3000; timeout = 3000;
modules.add( new TrafficChannelManager( channelModel, modules.add( new TrafficChannelManager( channelModel,
channelProcessingManager, decodeConfig, channelProcessingManager, decodeConfig,

View File

@@ -260,6 +260,7 @@ public class ChannelStatePanel extends JPanel
if( channelState != null ) if( channelState != null )
{ {
<<<<<<< Upstream, based on origin/master
switch( channelState.getState() ) switch( channelState.getState() )
{ {
case CALL: case CALL:
@@ -284,6 +285,24 @@ public class ChannelStatePanel extends JPanel
if( p == null ) if( p == null )
{ {
p = getGradient( mColorTopIdle, mColorMiddleIdle ); p = getGradient( mColorTopIdle, mColorMiddleIdle );
=======
case CALL:
p = getGradient( mColorTopCall, mColorMiddleCall );
break;
case CONTROL:
p = getGradient( mColorTopControl, mColorMiddleControl );
break;
case DATA:
p = getGradient( mColorTopData, mColorMiddleData );
break;
case FADE:
p = getGradient( mColorTopFade, mColorMiddleFade );
break;
case IDLE:
default:
p = getGradient( mColorTopIdle, mColorMiddleIdle );
break;
>>>>>>> 0e01381 Updates.
} }
g2.setPaint( p ); g2.setPaint( p );