Initial commit of redesigned internal processing and audio management.

Note: Several of the decoders are currently non-functioning in this
commit.  If you want the latest functioning codebase, please checkout
the commit prior to this one.  All decoders will eventually be updated
with this new architecture.

Currently broken:
- Logging and recording
- Aux decoders (Fleetsync/MDC/LoJack/Tait)
- LTR/Passport decoders

Changes in this commit:
- Module architecture for decoders and components with central
provisioning by the DecoderFactory
- Transition from Complex sample stream processing to float buffer
processing for improved memory management
- Redesigned filter structures - to support buffers and streams
- Resolved several memory leak issues
- Universal sharing of the thread pool manager
- Added centralized audio management with call/user prioritization and
new gui with mute/volume controls
- Embedded audio metadata for eventual streaming support
- Redesigned ProcessingChain to support independent re-use
- Added new TrafficChannelManager to handle traffic channel allocations
- Traffic Channel pool size and Call timeout available in P25 and
MPT1327 configs
- Redesigned channel and decoder gui components

src/instrument/gui/AudioSourceFrame.java

@@ -34,7 +34,13 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
 
-import message.MessageDirection;
+import module.decode.Decoder;
+import module.decode.DecoderType;
+import module.decode.fleetsync2.Fleetsync2Decoder;
+import module.decode.lj1200.LJ1200Decoder;
+import module.decode.mdc1200.MDCDecoder;
+import module.decode.p25.P25Decoder.Modulation;
+import module.decode.tait.Tait1200Decoder;
 import net.miginfocom.swing.MigLayout;
 
 import org.slf4j.Logger;
@@ -43,21 +49,6 @@ import org.slf4j.LoggerFactory;
 import source.wave.WaveSource;
 import source.wave.WaveSource.PositionListener;
 import controller.ResourceManager;
-import decode.Decoder;
-import decode.DecoderType;
-import decode.config.DecodeConfigLTRNet;
-import decode.config.DecodeConfigMPT1327;
-import decode.config.DecodeConfigPassport;
-import decode.fleetsync2.Fleetsync2Decoder;
-import decode.lj1200.LJ1200Decoder;
-import decode.ltrnet.LTRNetDecoder;
-import decode.mdc1200.MDCDecoder;
-import decode.mpt1327.MPT1327Decoder;
-import decode.mpt1327.MPT1327Decoder.Sync;
-import decode.p25.P25Decoder;
-import decode.p25.P25Decoder.Modulation;
-import decode.passport.PassportDecoder;
-import decode.tait.Tait1200Decoder;
 
 public class AudioSourceFrame extends JInternalFrame implements PositionListener
 {
@@ -188,25 +179,25 @@ public class AudioSourceFrame extends JInternalFrame implements PositionListener
 							decoder = new LJ1200Decoder( null );
 							break;
 						case LTR_NET:
-						    decoder = new LTRNetDecoder( new DecodeConfigLTRNet(), 
-					    		mSource.getSampleType(), null, MessageDirection.OSW );
+//						    decoder = new LTRNetDecoder( new DecodeConfigLTRNet(), 
+//					    		mSource.getSampleType(), null, MessageDirection.OSW );
 						    break;
 						case MDC1200:
 							decoder = new MDCDecoder( null );
 							break;
 						case MPT1327:
-							decoder = new MPT1327Decoder( new DecodeConfigMPT1327(),
-									mSource.getSampleType(), null, Sync.NORMAL );
+//							decoder = new MPT1327Decoder( new DecodeConfigMPT1327(),
+//									mSource.getSampleType(), null, Sync.NORMAL );
 							break;
 						case PASSPORT:
-							decoder = new PassportDecoder( new DecodeConfigPassport(),
-									mSource.getSampleType(), null );
+//							decoder = new PassportDecoder( new DecodeConfigPassport(),
+//									mSource.getSampleType(), null );
 							break;
 						case P25_PHASE1:
 							ResourceManager rm = new ResourceManager();
 							
-							decoder = new P25Decoder( rm, mSource.getSampleType(), 
-								(Modulation)mComboModulations.getSelectedItem(), null );
+//							decoder = new P25Decoder( rm, mSource.getSampleType(), 
+//								(Modulation)mComboModulations.getSelectedItem(), null );
 							break;
 						case TAIT_1200:
 							decoder = new Tait1200Decoder( null );

src/instrument/gui/ConstellationPanel.java

@@ -29,11 +29,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sample.Listener;
-import sample.complex.ComplexSample;
+import sample.complex.Complex;
 import source.wave.WaveSource.PositionListener;
 
 public class ConstellationPanel extends JInternalFrame 
-					  implements PositionListener, Listener<ComplexSample>
+					  implements PositionListener, Listener<Complex>
 {
     private static final long serialVersionUID = 1L;
 	private final static Logger mLog = 
@@ -69,7 +69,7 @@ public class ConstellationPanel extends JInternalFrame
     }
 
 	@Override
-	public void receive( ComplexSample sample )
+	public void receive( Complex sample )
 	{
 		mConstellation.receive( sample );
 	}

src/instrument/gui/DecoderViewFrame.java

@@ -22,6 +22,8 @@ import instrument.tap.Tap;
 import instrument.tap.TapViewPanel;
 import instrument.tap.stream.BinaryTap;
 import instrument.tap.stream.BinaryTapViewPanel;
+import instrument.tap.stream.ComplexSampleTap;
+import instrument.tap.stream.ComplexSampleTapViewPanel;
 import instrument.tap.stream.ComplexTap;
 import instrument.tap.stream.ComplexTapViewPanel;
 import instrument.tap.stream.DibitTap;
@@ -51,18 +53,18 @@ import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 
 import message.Message;
+import module.decode.Decoder;
 import net.miginfocom.swing.MigLayout;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sample.Listener;
-import source.Source.SampleType;
+import sample.SampleType;
 import source.wave.ComplexWaveSource;
 import source.wave.FloatWaveSource;
 import source.wave.WaveSource;
 import source.wave.WaveSource.PositionListener;
-import decode.Decoder;
 
 public class DecoderViewFrame extends JInternalFrame 
 							  implements PositionListener, Listener<Message>
@@ -85,12 +87,12 @@ public class DecoderViewFrame extends JInternalFrame
 		if( source.getSampleType() == SampleType.COMPLEX )
 		{
 			ComplexWaveSource cws = (ComplexWaveSource)mWaveSource;
-			cws.addListener( mDecoder.getComplexReceiver() );
+//			cws.addListener( mDecoder.getComplexReceiver() );
 		}
 		else if( source.getSampleType() == SampleType.REAL )
 		{
 			FloatWaveSource fws = (FloatWaveSource)mWaveSource;
-			fws.setListener( mDecoder.getRealReceiver() );
+//			fws.setListener( mDecoder.getRealReceiver() );
 		}
 		
 		mDecoder.addMessageListener( this );
@@ -102,7 +104,7 @@ public class DecoderViewFrame extends JInternalFrame
 	{
         setLayout( new MigLayout( "insets 0 0 0 0 ", "[grow,fill]", "[grow,fill]" ) );
 
-		setTitle( "Decoder [" + mDecoder.getType().getDisplayString() + "]" );
+		setTitle( "Decoder [" + mDecoder.getDecoderType().getDisplayString() + "]" );
 		setPreferredSize( new Dimension( 450, 250 ) );
 		setSize( 450, 250 );
 
@@ -177,6 +179,9 @@ public class DecoderViewFrame extends JInternalFrame
 			case STREAM_COMPLEX:
 				panel = new ComplexTapViewPanel( (ComplexTap)tap );
 				break;
+			case STREAM_COMPLEX_SAMPLE:
+				panel = new ComplexSampleTapViewPanel( (ComplexSampleTap)tap );
+				break;
 			case STREAM_DIBIT:
 				panel = new DibitTapViewPanel( (DibitTap)tap );
 				break;

src/instrument/tap/TapType.java

@@ -22,6 +22,7 @@ public enum TapType
 	EVENT_SYNC_DETECT,
 	STREAM_BINARY,
 	STREAM_COMPLEX,
+	STREAM_COMPLEX_SAMPLE,
 	STREAM_DIBIT,
 	STREAM_EYE_DIAGRAM,
 	STREAM_FLOAT,

src/instrument/tap/stream/ComplexSampleTap.java

@@ -0,0 +1,65 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014 Dennis Sheirer
+ * 
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package instrument.tap.stream;
+
+import instrument.tap.TapListener;
+import instrument.tap.TapType;
+import sample.Listener;
+import sample.complex.Complex;
+import sample.complex.ComplexSampleListener;
+
+public class ComplexSampleTap extends StreamTap implements ComplexSampleListener
+{
+	private ComplexSampleListener mListener;
+	
+	public ComplexSampleTap( String name, 
+					   int delay, 
+					   float sampleRateRatio )
+    {
+	    super( TapType.STREAM_COMPLEX_SAMPLE, name, delay, sampleRateRatio );
+    }
+	
+	public ComplexSampleTap( TapType tapType, String name, int delay, float sampleRateRatio )
+	{
+	    super( tapType, name, delay, sampleRateRatio );
+	}
+
+	@Override
+    public void receive( float inphase, float quadrature )
+    {
+		if( mListener != null )
+		{
+			mListener.receive( inphase, quadrature );
+		}
+		
+		for( TapListener listener: mListeners )
+		{
+			listener.receive( new Complex( inphase, quadrature ) );
+		}
+    }
+
+    public void setListener( ComplexSampleListener listener )
+    {
+		mListener = listener;
+    }
+
+    public void removeListener( ComplexSampleListener listener )
+    {
+		mListener = null;
+    }
+}

src/instrument/tap/stream/ComplexSampleTapViewPanel.java

@@ -0,0 +1,155 @@
+/*******************************************************************************
+ *     SDR Trunk 
+ *     Copyright (C) 2014 Dennis Sheirer
+ * 
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ * 
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ * 
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program.  If not, see <http://www.gnu.org/licenses/>
+ ******************************************************************************/
+package instrument.tap.stream;
+
+import gui.SDRTrunk;
+import instrument.gui.SampleModel;
+import instrument.tap.Tap;
+import instrument.tap.TapViewPanel;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.geom.Path2D;
+import java.awt.geom.Point2D;
+import java.util.List;
+import java.util.Observable;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import sample.complex.Complex;
+
+public class ComplexSampleTapViewPanel extends TapViewPanel
+{
+    private static final long serialVersionUID = 1L;
+	private final static Logger mLog = LoggerFactory.getLogger( SDRTrunk.class );
+
+	private Tap mTap;
+	private List<Complex> mSamples;
+	private int mSampleCount;
+
+	public ComplexSampleTapViewPanel( ComplexSampleTap tap )
+	{
+		super( new SampleModel<ComplexTap>(), tap.getName() );
+		
+		setSize( new Dimension( 400, 400 ) );
+		
+		mTap = tap;
+		mTap.addListener( getModel() );
+
+		mSampleCount = (int)( 2000 * tap.getSampleRateRatio() );
+
+		getModel().setSampleCount( mSampleCount );
+		getModel().setDelay( tap.getDelay() );
+		
+		mLog.info( "Complex Tap Panel [" + tap.getName() + "] count: " + 
+			getModel().getSampleCount() + " delay:" + getModel().getDelay() );
+	}
+	
+	@Override
+    public void update( Observable arg0, Object arg1 )
+    {
+		mSamples = (List<Complex>)getModel().getSamples();
+		repaint();
+    }
+	
+	public void paintComponent( Graphics g )
+	{
+		super.paintComponent( g );
+		
+		Graphics2D g2 = (Graphics2D)g;
+
+		int height = getHeight();
+		int width = getWidth();
+		
+		g2.setColor( Color.DARK_GRAY );
+		
+		float middle = (float)height / 4.0f;
+
+		g2.drawLine( 0, (int)middle, width, (int)middle );
+		g2.drawLine( 0, (int)( 3 * middle ), width, (int)( 3 * middle ) );
+
+		if( mSamples != null && 
+			mSamples.size() > 0  )
+		{
+			g2.setColor( getForeground() );
+			
+			g2.drawString( mLabel, 5 , 15 );
+
+			Path2D.Float polylineReal = 
+		        new Path2D.Float( Path2D.Float.WIND_EVEN_ODD, mSamples.size() );
+			Path2D.Float polylineImag = 
+			        new Path2D.Float( Path2D.Float.WIND_EVEN_ODD, mSamples.size() );
+
+			/* Move to the first point */
+			Point2D.Float firstReal = resolve( 0, mSamples.get( 0 ), Type.REAL );
+			polylineReal.moveTo( firstReal.x, firstReal.y );
+
+			Point2D.Float firstImag = resolve( 0, mSamples.get( 0 ), Type.IMAGINERY );
+			polylineImag.moveTo( firstImag.x, firstImag.y );
+			
+			for( int x = 1; x < mSamples.size(); x++ )
+			{
+				Point2D.Float pointReal = resolve( x, mSamples.get( x ), Type.REAL );
+				polylineReal.lineTo( pointReal.x, pointReal.y );
+
+				Point2D.Float pointImag = resolve( x, mSamples.get( x ), Type.IMAGINERY );
+				polylineImag.lineTo( pointImag.x, pointImag.y );
+				
+//				mLog.debug( "Imag y:" + pointImag.getY() + " height:" + getHeight() );
+			}
+
+			g2.draw( polylineReal );
+			g2.draw( polylineImag );
+		}
+		
+		g2.dispose();
+	}
+	
+	
+	private Point2D.Float resolve( int index, Complex sample, Type type )
+	{
+		int middle = (int)( getHeight() / 4 );
+
+		float y = middle - ( middle * mVerticalZoom * ( type == Type.REAL ? 
+				sample.real() : sample.imaginary()) );
+
+		if( type == Type.IMAGINERY )
+		{
+			y += ( middle * 2 );
+		}
+		
+		/* Clip y to zero as necessary */
+		y = ( y < 0 ) ? 0 : y;
+
+		/* Clip y to max height as necessary */
+		y = ( y > getHeight() ) ? getHeight() : y;
+		
+		float indexWidth = (float)getWidth() / (float)mSampleCount;
+		
+		float x = (float)index * indexWidth;
+
+		Point2D.Float point = new Point2D.Float( x, y );
+		
+		return new Point2D.Float( x , y );
+	}
+	
+	public enum Type{ REAL,IMAGINERY };
+}

src/instrument/tap/stream/ComplexTap.java

@@ -20,16 +20,15 @@ package instrument.tap.stream;
 import instrument.tap.TapListener;
 import instrument.tap.TapType;
 import sample.Listener;
-import sample.complex.ComplexSample;
+import sample.complex.Complex;
 
-public class ComplexTap extends StreamTap 
-							  implements Listener<ComplexSample>
+public class ComplexTap extends StreamTap implements Listener<Complex>
 {
-	private Listener<ComplexSample> mListener;
+	private Listener<Complex> mListener;
 	
 	public ComplexTap( String name, 
-						   int delay, 
-						   float sampleRateRatio )
+					   int delay, 
+					   float sampleRateRatio )
     {
 	    super( TapType.STREAM_COMPLEX, name, delay, sampleRateRatio );
     }
@@ -40,25 +39,25 @@ public class ComplexTap extends StreamTap
 	}
 
 	@Override
-    public void receive( ComplexSample t )
+    public void receive( Complex sample )
     {
 		if( mListener != null )
 		{
-			mListener.receive( t );
+			mListener.receive( sample );
 		}
 		
 		for( TapListener listener: mListeners )
 		{
-			listener.receive( t );
+			listener.receive( sample );
 		}
     }
 
-    public void setListener( Listener<ComplexSample> listener )
+    public void setListener( Listener<Complex> listener )
     {
 		mListener = listener;
     }
 
-    public void removeListener( Listener<ComplexSample> listener )
+    public void removeListener( Listener<Complex> listener )
     {
 		mListener = null;
     }

src/instrument/tap/stream/ComplexTapViewPanel.java

@@ -34,7 +34,7 @@ import java.util.Observable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import sample.complex.ComplexSample;
+import sample.complex.Complex;
 
 public class ComplexTapViewPanel extends TapViewPanel
 {
@@ -42,7 +42,7 @@ public class ComplexTapViewPanel extends TapViewPanel
 	private final static Logger mLog = LoggerFactory.getLogger( SDRTrunk.class );
 
 	private Tap mTap;
-	private List<ComplexSample> mSamples;
+	private List<Complex> mSamples;
 	private int mSampleCount;
 
 	public ComplexTapViewPanel( ComplexTap tap )
@@ -66,7 +66,7 @@ public class ComplexTapViewPanel extends TapViewPanel
 	@Override
     public void update( Observable arg0, Object arg1 )
     {
-		mSamples = (List<ComplexSample>)getModel().getSamples();
+		mSamples = (List<Complex>)getModel().getSamples();
 		repaint();
     }
 	
@@ -124,7 +124,7 @@ public class ComplexTapViewPanel extends TapViewPanel
 	}
 	
 	
-	private Point2D.Float resolve( int index, ComplexSample sample, Type type )
+	private Point2D.Float resolve( int index, Complex sample, Type type )
 	{
 		int middle = (int)( getHeight() / 4 );
 

src/instrument/tap/stream/EyeDiagramData.java

@@ -1,26 +1,32 @@
 package instrument.tap.stream;
 
-import sample.complex.ComplexSample;
 
 public class EyeDiagramData
 {
-	private ComplexSample[] mSamples;
+	private float[] mSamplesInphase;
+	private float[] mSamplesQuadrature;
 	private float mLeftPoint;
 	private float mRightPoint;
 	private float mError;
 	
-	public EyeDiagramData( ComplexSample[] samples, float leftPoint, 
-			float rightPoint, float error )
+	public EyeDiagramData( float[] samplesInphase, float[] samplesQuadrature, 
+			float leftPoint, float rightPoint, float error )
 	{
-		mSamples = samples;
+		mSamplesInphase = samplesInphase;
+		mSamplesQuadrature = samplesQuadrature;
 		mLeftPoint = leftPoint;
 		mRightPoint = rightPoint;
 		mError = error;
 	}
 	
-	public ComplexSample[] getSamples()
+	public float[] getInphaseSamples()
 	{
-		return mSamples;
+		return mSamplesInphase;
+	}
+
+	public float[] getQuadratureSamples()
+	{
+		return mSamplesQuadrature;
 	}
 
 	public float getLeftPoint()

src/instrument/tap/stream/EyeDiagramDataTap.java

@@ -17,10 +17,11 @@
  ******************************************************************************/
 package instrument.tap.stream;
 
+import module.decode.p25.P25_LSMDecoder;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import decode.p25.P25Decoder;
 import instrument.tap.TapListener;
 import instrument.tap.TapType;
 import sample.Listener;

src/instrument/tap/stream/EyeDiagramDataTapPanel.java

@@ -32,7 +32,7 @@ import java.util.Observable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import sample.complex.ComplexSample;
+import sample.complex.Complex;
 
 public class EyeDiagramDataTapPanel extends TapViewPanel
 {
@@ -94,10 +94,11 @@ public class EyeDiagramDataTapPanel extends TapViewPanel
 				
 				EyeDiagramData data = mSamples.get( z );
 
-				ComplexSample[] samples = data.getSamples();
+				float[] inphaseSamples = data.getInphaseSamples();
+				float[] quadratureSamples = data.getQuadratureSamples();
 				
 				/* Draw the sample set containing two symbol periods of data */
-				if( samples.length >= 1 )
+				if( inphaseSamples.length >= 1 )
 				{
 					Path2D.Float iLine = new Path2D.Float( GeneralPath.WIND_EVEN_ODD, 20 );
 					Path2D.Float qLine = new Path2D.Float( GeneralPath.WIND_EVEN_ODD, 20 );
@@ -105,17 +106,17 @@ public class EyeDiagramDataTapPanel extends TapViewPanel
 					
 					float xAxis = 0;
 					
-					iLine.moveTo( xAxis, getSampleHeight( halfHeight, samples[ 0 ].inphase() ) );
-					qLine.moveTo( xAxis + third, getSampleHeight( halfHeight, samples[ 0 ].quadrature() ) );
-					mLine.moveTo( xAxis + ( two_thirds ), getMagnitudeHeight( samples[ 0 ].magnitude() ) );
+					iLine.moveTo( xAxis, getSampleHeight( halfHeight, inphaseSamples[ 0 ] ) );
+					qLine.moveTo( xAxis + third, getSampleHeight( halfHeight, quadratureSamples[ 0 ] ) );
+					mLine.moveTo( xAxis + ( two_thirds ), getMagnitudeHeight( Complex.magnitude( inphaseSamples[ 0 ], quadratureSamples[ 0 ] ) ) );
 
-					for( int x = 1; x < samples.length; x++ )
+					for( int x = 1; x < inphaseSamples.length; x++ )
 					{
 						xAxis += xAxisIncrement;
 						
-						iLine.lineTo( xAxis, getSampleHeight( halfHeight, samples[ x ].inphase() ) );
-						qLine.lineTo( xAxis + third, getSampleHeight( halfHeight, samples[ x ].quadrature() ) );
-						mLine.lineTo( xAxis + two_thirds, getMagnitudeHeight( samples[ x ].magnitude() ) );
+						iLine.lineTo( xAxis, getSampleHeight( halfHeight, inphaseSamples[ x ] ) );
+						qLine.lineTo( xAxis + third, getSampleHeight( halfHeight, quadratureSamples[ x ] ) );
+						mLine.lineTo( xAxis + two_thirds, getMagnitudeHeight( Complex.magnitude( inphaseSamples[ x ], quadratureSamples[ x ] ) ) );
 					}
 					
 					g2.draw( iLine );

src/instrument/tap/stream/FloatBufferTap.java

@@ -0,0 +1,38 @@
+package instrument.tap.stream;
+
+import sample.Listener;
+import sample.real.RealBuffer;
+
+public class FloatBufferTap extends FloatTap implements Listener<RealBuffer>
+{
+	private Listener<RealBuffer> mListener;
+	
+	public FloatBufferTap( String name, int delay, float sampleRateRatio )
+	{
+		super( name, delay, sampleRateRatio );
+	}
+
+	@Override
+	public void receive( RealBuffer buffer )
+	{
+		if( mListener != null )
+		{
+			mListener.receive( buffer );
+		}
+
+		for( float sample: buffer.getSamples() )
+		{
+			receive( sample );
+		}
+	}
+	
+	public void setListener( Listener<RealBuffer> listener )
+    {
+		mListener = listener;
+    }
+
+    public void removeListener( Listener<RealBuffer> listener )
+    {
+		mListener = null;
+    }
+}

src/instrument/tap/stream/QPSKTapPanel.java

@@ -32,7 +32,7 @@ import java.util.Observable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import sample.complex.ComplexSample;
+import sample.complex.Complex;
 
 public class QPSKTapPanel extends TapViewPanel
 {
@@ -40,7 +40,7 @@ public class QPSKTapPanel extends TapViewPanel
 	private final static Logger mLog = LoggerFactory.getLogger( SDRTrunk.class );
 
 	private Tap mTap;
-	private List<ComplexSample> mSamples;
+	private List<Complex> mSamples;
 	private int mSampleCount;
 
 	public QPSKTapPanel( ComplexTap tap )
@@ -62,7 +62,7 @@ public class QPSKTapPanel extends TapViewPanel
 	@Override
     public void update( Observable arg0, Object arg1 )
     {
-		mSamples = (List<ComplexSample>)getModel().getSamples();
+		mSamples = (List<Complex>)getModel().getSamples();
 		repaint();
     }
 	
@@ -107,7 +107,7 @@ public class QPSKTapPanel extends TapViewPanel
 
 			int threshold = (int)( mSamples.size() * 0.9f );
 
-			for( ComplexSample sample: mSamples )
+			for( Complex sample: mSamples )
 			{
 				/* Set color to foreground for newest 10% of constellations */
 				if( counter == threshold )