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

Decouples DecoderState from the Decoder and makes DecoderState inherit

Browse Source 
from Module so that Decoder can function independent of DecoderSTate and
DecoderState can more cleanly interface with other modules. 

Resolves issue with LTR-type decoders where the AudioModule was
filtering demodulated audio buffers before the decoder received the
audio - demodulated audio buffers are now copied before creating
AudioPackets.
This commit is contained in:
denny
2015-09-26 05:45:34 -04:00
parent eb1c2fc7a1
commit 9c69733034
57 changed files with 885 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/module/decode/fleetsync2/Fleetsync2DecoderPanel.java
View File

@@ -20,16 +20,14 @@ package module.decode.fleetsync2;
import java.awt.EventQueue;
import javax.swing.JLabel;
import javax.swing.JSeparator;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import alias.Alias;
import module.decode.DecoderFactory;
import module.decode.state.ChangedAttribute;
import module.decode.state.DecoderPanel;
import net.miginfocom.swing.MigLayout;
import settings.ColorSetting;
import settings.ColorSetting.ColorSettingName;
import settings.Setting;
@@ -55,16 +53,17 @@ public class Fleetsync2DecoderPanel extends DecoderPanel
private JLabel mMessageType = new JLabel( " " );
public Fleetsync2DecoderPanel( SettingsManager settingsManager,
Fleetsync2Decoder decoder )
Fleetsync2DecoderState decoderState )
{
super( settingsManager, decoder );
super( settingsManager, decoderState );
init();
}
private FleetsyncDecoderState getState()
@Override
public Fleetsync2DecoderState getDecoderState()
{
return (FleetsyncDecoderState)mDecoder.getDecoderState();
return (Fleetsync2DecoderState)super.getDecoderState();
}
public void dispose()
@@ -128,7 +127,7 @@ public class Fleetsync2DecoderPanel extends DecoderPanel
switch( changedAttribute )
{
case FROM_TALKGROUP:
String from = getState().getFromID();
String from = getDecoderState().getFromID();
if( from != null )
{
@@ -142,16 +141,16 @@ public class Fleetsync2DecoderPanel extends DecoderPanel
}
break;
case FROM_TALKGROUP_ALIAS:
setAliasLabel( mFromAlias, getState().getFromIDAlias() );
setAliasLabel( mFromAlias, getDecoderState().getFromIDAlias() );
break;
case MESSAGE:
mMessage.setText( getState().getMessage() );
mMessage.setText( getDecoderState().getMessage() );
break;
case MESSAGE_TYPE:
mMessageType.setText( getState().getMessageType() );
mMessageType.setText( getDecoderState().getMessageType() );
break;
case TO_TALKGROUP:
String to = getState().getToID();
String to = getDecoderState().getToID();
if( to != null )
{
@@ -165,7 +164,7 @@ public class Fleetsync2DecoderPanel extends DecoderPanel
}
break;
case TO_TALKGROUP_ALIAS:
setAliasLabel( mToAlias, getState().getToIDAlias() );
setAliasLabel( mToAlias, getDecoderState().getToIDAlias() );
break;
default:
break;