GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -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

100
src/module/decode/Decoder.java
View File

@@ -20,45 +20,19 @@ package module.decode;
import message.IMessageProvider;
import message.Message;
import module.Module;
import module.decode.event.CallEvent;
import module.decode.event.ICallEventProvider;
import module.decode.state.DecoderState;
import module.decode.state.DecoderStateEvent;
import module.decode.state.IDecoderStateEventListener;
import module.decode.state.IDecoderStateEventProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Broadcaster;
import sample.Listener;
public abstract class Decoder extends Module
implements ICallEventProvider,
IDecoderStateEventListener,
IDecoderStateEventProvider,
IMessageProvider
public abstract class Decoder extends Module implements IMessageProvider
{
private final static Logger mLog = LoggerFactory.getLogger( Decoder.class );
/* This has to be a broadcaster in order for references to persist */
protected Broadcaster<Message> mMessageBroadcaster = new Broadcaster<>();
/**
* Broadcasts decoded messages both to the internal decoder state and any
* external registered message listeners
*/
protected Broadcaster<Message> mMessageBroadcaster =
new Broadcaster<Message>();
protected DecoderState mDecoderState;
/**
* Decoder - parent class for all decoders, demodulators and components.
*/
public Decoder( DecoderState decoderState )
public Decoder()
{
assert( decoderState != null );
mDecoderState = decoderState;
mMessageBroadcaster.addListener( mDecoderState );
}
@Override
@@ -68,32 +42,6 @@ public abstract class Decoder extends Module
mMessageBroadcaster = null;
}
/**
* Allows decoder to broadcast initialization messages/events so that
* external modules can be correctly configured. This method is invoked
* prior to processing start.
*/
public void reset()
{
mDecoderState.init();
}
/**
* Start the decoder
*/
@Override
public void start()
{
}
/**
* Stop the decoder
*/
@Override
public void stop()
{
}
/**
* Identifies the decoder type (ie protocol)
*/
@@ -107,7 +55,7 @@ public abstract class Decoder extends Module
public void addMessageListener( Listener<Message> listener )
{
mMessageBroadcaster.addListener( listener );
}
}
/**
* Removes the listener from receiving decoded messages from all attached
@@ -118,42 +66,4 @@ public abstract class Decoder extends Module
{
mMessageBroadcaster.removeListener( listener );
}
/**
* Decoder State - tracks the state of the decoder
*/
public DecoderState getDecoderState()
{
return mDecoderState;
}
@Override
public Listener<DecoderStateEvent> getDecoderStateListener()
{
return mDecoderState.getDecoderStateListener();
}
@Override
public void setDecoderStateListener( Listener<DecoderStateEvent> listener )
{
mDecoderState.setDecoderStateListener( listener );
}
@Override
public void removeDecoderStateListener()
{
mDecoderState.removeDecoderStateListener();
}
@Override
public void setCallEventListener( Listener<CallEvent> listener )
{
mDecoderState.setCallEventListener( listener );
}
@Override
public void removeCallEventListener()
{
mDecoderState.removeCallEventListener();
}
}