mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-17 02:57:35 -05:00
Merges master 88d3088
This commit is contained in:
@@ -77,7 +77,6 @@ public class P25_C4FMDecoder extends P25Decoder
|
|||||||
/* Filter demodulated sample buffers */
|
/* Filter demodulated sample buffers */
|
||||||
float[] filter = FilterFactory.getLowPass( 48000, 2500, 4000, 80, WindowType.HANNING, true );
|
float[] filter = FilterFactory.getLowPass( 48000, 2500, 4000, 80, WindowType.HANNING, true );
|
||||||
|
|
||||||
// mLog.debug( "Demod Filter tap count:" + filter.length + " coefficients:" + Arrays.toString( filter ) );
|
|
||||||
mC4FMPreFilter = new RealFIRFilter_RB_RB( filter, 1.0f );
|
mC4FMPreFilter = new RealFIRFilter_RB_RB( filter, 1.0f );
|
||||||
|
|
||||||
/* Shape gain and frequency offsets to optimize sample stream */
|
/* Shape gain and frequency offsets to optimize sample stream */
|
||||||
|
|||||||
@@ -19,17 +19,15 @@ package module.decode.state;
|
|||||||
|
|
||||||
import java.awt.Color;
|
import java.awt.Color;
|
||||||
import java.awt.Component;
|
import java.awt.Component;
|
||||||
import java.awt.Point;
|
|
||||||
import java.awt.event.MouseEvent;
|
import java.awt.event.MouseEvent;
|
||||||
import java.awt.event.MouseListener;
|
import java.awt.event.MouseListener;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
import javax.swing.JMenu;
|
import javax.swing.JMenu;
|
||||||
import javax.swing.JPanel;
|
import javax.swing.JPanel;
|
||||||
import javax.swing.JPopupMenu;
|
import javax.swing.JPopupMenu;
|
||||||
import javax.swing.JSeparator;
|
import javax.swing.JSeparator;
|
||||||
import javax.swing.SwingUtilities;
|
|
||||||
|
|
||||||
import net.miginfocom.swing.MigLayout;
|
import net.miginfocom.swing.MigLayout;
|
||||||
|
|
||||||
@@ -57,7 +55,8 @@ public class ChannelList extends JPanel implements ChannelEventListener
|
|||||||
|
|
||||||
private final static Logger mLog = LoggerFactory.getLogger( ChannelList.class );
|
private final static Logger mLog = LoggerFactory.getLogger( ChannelList.class );
|
||||||
|
|
||||||
private Map<Channel,ChannelPanel> mDisplayedPanels = new HashMap<Channel,ChannelPanel>();
|
private Map<Channel,ChannelPanel> mDisplayedPanels =
|
||||||
|
new ConcurrentHashMap<Channel,ChannelPanel>();
|
||||||
|
|
||||||
private ChannelModel mChannelModel;
|
private ChannelModel mChannelModel;
|
||||||
private ChannelProcessingManager mChannelProcessingManager;
|
private ChannelProcessingManager mChannelProcessingManager;
|
||||||
|
|||||||
Reference in New Issue
Block a user