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

Merges master 88d3088

Browse Source
This commit is contained in:
denny
2016-02-20 17:56:28 -05:00
parent 7ff9e9a7ce
commit ca2b12b868
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/module/decode/p25/P25_C4FMDecoder.java
View File

@@ -77,7 +77,6 @@ public class P25_C4FMDecoder extends P25Decoder
/* Filter demodulated sample buffers */
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 );
/* Shape gain and frequency offsets to optimize sample stream */

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

@@ -19,17 +19,15 @@ package module.decode.state;
import java.awt.Color;
import java.awt.Component;
import java.awt.Point;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import javax.swing.JMenu;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
import javax.swing.SwingUtilities;
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 Map<Channel,ChannelPanel> mDisplayedPanels = new HashMap<Channel,ChannelPanel>();
private Map<Channel,ChannelPanel> mDisplayedPanels =
new ConcurrentHashMap<Channel,ChannelPanel>();
private ChannelModel mChannelModel;
private ChannelProcessingManager mChannelProcessingManager;