GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Work in progress - program compiles and runs

Browse Source
This commit is contained in:
denny
2016-01-02 12:29:40 -05:00
parent d8a20b5adb
commit c405ddad96
36 changed files with 374 additions and 694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/module/decode/DecodeComponentEditor.java
View File

@@ -156,7 +156,7 @@ public class DecodeComponentEditor extends AbstractChannelEditor
//The component that calls save will invoke the change broadcast
mChannelNode.getChannel()
.setDecodeConfiguration( mEditor.getConfig(), false );
.setDecodeConfiguration( mEditor.getConfig() );
}
/**

8
src/module/decode/DecoderFactory.java
View File

@@ -135,8 +135,8 @@ public class DecoderFactory
RecordConfiguration recordConfig,
AuxDecodeConfiguration auxConfig,
AliasList aliasList,
System system,
Site site,
String system,
String site,
String channelName )
{
List<Module> modules = getPrimaryModules( channelType, decodeConfig,
@@ -176,8 +176,8 @@ public class DecoderFactory
DecodeConfiguration decodeConfig,
RecordConfiguration recordConfig,
AliasList aliasList,
System system,
Site site,
String system,
String site,
String channelName,
ResourceManager resourceManager )
{

6
src/module/decode/event/CallEventPanel.java
View File

@@ -62,7 +62,7 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
@Override
public void channelChanged( final ChannelEvent event )
{
if( event.getEvent() == Event.CHANGE_SELECTED &&
if( event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE &&
event.getChannel().isSelected() )
{
if( mDisplayedChannel == null ||
@@ -99,8 +99,8 @@ public class CallEventPanel extends JPanel implements ChannelEventListener
}
}
else if( event.getEvent() == Event.CHANNEL_PROCESSING_STOPPED ||
event.getEvent() == Event.CHANNEL_DISABLED )
else if( event.getEvent() == Event.NOTIFICATION_PROCESSING_STOP ||
event.getEvent() == Event.REQUEST_DISABLE )
{
if( mDisplayedChannel != null &&
mDisplayedChannel == event.getChannel() )

6
src/module/decode/event/MessageActivityPanel.java
View File

@@ -82,7 +82,7 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
{
boolean changed = false;
if( event.getEvent() == Event.CHANGE_SELECTED &&
if( event.getEvent() == Event.NOTIFICATION_SELECTION_CHANGE &&
event.getChannel().isSelected() )
{
if( mDisplayedChannel == null ||
@@ -105,8 +105,8 @@ public class MessageActivityPanel extends JPanel implements ChannelEventListener
changed = true;
}
}
else if( event.getEvent() == Event.CHANNEL_PROCESSING_STOPPED ||
event.getEvent() == Event.CHANNEL_DISABLED )
else if( event.getEvent() == Event.NOTIFICATION_PROCESSING_STOP ||
event.getEvent() == Event.REQUEST_DISABLE )
{
if( mDisplayedChannel != null &&
mDisplayedChannel == event.getChannel() )

4
src/module/decode/p25/audio/P25AudioModule.java
View File

@@ -232,10 +232,10 @@ public class P25AudioModule extends Module implements Listener<Message>,
{
switch( event.getEvent() )
{
case CHANNEL_STATE_RESET:
case NOTIFICATION_STATE_RESET:
mAudioMetadata.reset();
break;
case CHANGE_SELECTED:
case NOTIFICATION_SELECTION_CHANGE:
mAudioMetadata.setSelected( event.getChannel().isSelected() );
break;
default:

4
src/module/decode/state/ChannelList.java
View File

@@ -81,10 +81,10 @@ public class ChannelList extends JPanel implements ChannelEventListener
{
switch( event.getEvent() )
{
case CHANNEL_PROCESSING_STARTED:
case NOTIFICATION_PROCESSING_START:
addChannelPanel( event.getChannel() );
break;
case CHANNEL_PROCESSING_STOPPED:
case NOTIFICATION_PROCESSING_STOP:
removeChannelPanel( event.getChannel() );
break;
default:

4
src/module/decode/state/ChannelStatePanel.java
View File

@@ -111,12 +111,12 @@ public class ChannelStatePanel extends JPanel
setLayout( new MigLayout( "insets 1 1 1 1", "[grow,fill]", "[]0[]0[]") );
mSystemLabel = new JLabel( mChannel.getSystem().getName() );
mSystemLabel = new JLabel( mChannel.getSystem() );
mSystemLabel.setFont( mFontDetails );
mSystemLabel.setForeground( mColorLabelDetails );
add( mSystemLabel );
mSiteLabel = new JLabel( mChannel.getSite().getName() );
mSiteLabel = new JLabel( mChannel.getSite() );
mSiteLabel.setFont( mFontDetails );
mSiteLabel.setForeground( mColorLabelDetails );
add( mSiteLabel );

19
src/module/decode/state/TrafficChannelManager.java
View File

@@ -15,7 +15,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import record.config.RecordConfiguration;
import sample.Broadcaster;
import sample.Listener;
import source.config.SourceConfigTuner;
import source.tuner.TunerChannel;
@@ -44,8 +43,8 @@ public class TrafficChannelManager extends Module
private DecodeConfiguration mDecodeConfiguration;
private RecordConfiguration mRecordConfiguration;
private ResourceManager mResourceManager;
private System mSystem;
private Site mSite;
private String mSystem;
private String mSite;
private String mAliasListName;
private long mTrafficChannelTimeout;
private CallEvent mPreviousDoNotMonitorCallEvent;
@@ -72,8 +71,8 @@ public class TrafficChannelManager extends Module
public TrafficChannelManager( ResourceManager resourceManager,
DecodeConfiguration decodeConfiguration,
RecordConfiguration recordConfiguration,
System system,
Site site,
String system,
String site,
String aliasListName,
long trafficChannelTimeout,
int trafficChannelPoolSize )
@@ -145,8 +144,8 @@ public class TrafficChannelManager extends Module
{
channel.setSourceConfiguration( new SourceConfigTuner( tunerChannel ) );
channel.setSystem( mSystem, false );
channel.setSite( mSite, false );
channel.setSystem( mSystem );
channel.setSite( mSite );
channel.setName( channelNumber );
channel.setEnabled( true );
@@ -160,8 +159,8 @@ public class TrafficChannelManager extends Module
{
channel.setEnabled( false );
channel.setSystem( mSystem, false );
channel.setSite( mSite, false );
channel.setSystem( mSystem );
channel.setSite( mSite );
channel.setName( "Traffic" );
}
}
@@ -399,7 +398,7 @@ public class TrafficChannelManager extends Module
mTrafficChannelsInUse.remove( channelNumber );
/* Disable the channel and broadcast a notification */
channel.setEnabled( false, true );
channel.setEnabled( false );
}
}
}