From 5ae3cb38e116b2ae6afee62c4629181e6009cffa Mon Sep 17 00:00:00 2001
From: Denny <denny@denny-desktop>
Date: Mon, 15 Jan 2018 05:03:03 -0500
Subject: [PATCH] Merge master and re-apply the source event structures to the
 DFT processor.

---
 .../io/github/dsheirer/spectrum/DFTProcessor.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/github/dsheirer/spectrum/DFTProcessor.java b/src/main/java/io/github/dsheirer/spectrum/DFTProcessor.java
index 6e32e222..01b3ee1f 100644
--- a/src/main/java/io/github/dsheirer/spectrum/DFTProcessor.java
+++ b/src/main/java/io/github/dsheirer/spectrum/DFTProcessor.java
@@ -21,8 +21,8 @@ import io.github.dsheirer.properties.SystemProperties;
 import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.SampleType;
 import io.github.dsheirer.sample.complex.ComplexBuffer;
-import io.github.dsheirer.source.tuner.frequency.FrequencyChangeEvent;
-import io.github.dsheirer.source.tuner.frequency.IFrequencyChangeProcessor;
+import io.github.dsheirer.source.ISourceEventProcessor;
+import io.github.dsheirer.source.SourceEvent;
 import io.github.dsheirer.spectrum.converter.DFTResultsConverter;
 import io.github.dsheirer.util.ThreadPool;
 import org.jtransforms.fft.FloatFFT_1D;
@@ -40,15 +40,15 @@ import java.util.concurrent.atomic.AtomicBoolean;
  * Processes both complex samples or float samples and dispatches a float array of DFT results, using configurable fft
  * size and output dispatch timelines.
  */
-public class DFTProcessor implements Listener<ComplexBuffer>, IFrequencyChangeProcessor, IDFTWidthChangeProcessor
+public class DFTProcessor implements Listener<ComplexBuffer>, ISourceEventProcessor, IDFTWidthChangeProcessor
 {
     private static final Logger mLog = LoggerFactory.getLogger(DFTProcessor.class);
     private static final int BUFFER_QUEUE_MAX_SIZE = 12;
     private static final int BUFFER_QUEUE_OVERFLOW_RESET_THRESHOLD = 6;
     private static final String FRAME_RATE_PROPERTY = "spectral.display.frame.rate";
 
-    //The Cosine and Hanning windows seem to offer the best spectral display with minimal bin leakage/smearing
-    private WindowType mWindowType = Window.WindowType.HANNING;
+    //The Cosine and Hann windows seem to offer the best spectral display with minimal bin leakage/smearing
+    private WindowType mWindowType = WindowType.HANN;
     private double[] mWindow;
     private DFTSize mDFTSize = DFTSize.FFT04096;
     private DFTSize mNewDFTSize = DFTSize.FFT04096;
@@ -289,7 +289,7 @@ public class DFTProcessor implements Listener<ComplexBuffer>, IFrequencyChangePr
     }
 
     @Override
-    public void frequencyChanged(FrequencyChangeEvent event)
+    public void process(SourceEvent event)
     {
         switch(event.getEvent())
         {