From 5af4cb87062bc0a607116f4c13464a88acef1526 Mon Sep 17 00:00:00 2001
From: Denny <denny@denny-desktop>
Date: Sun, 4 Mar 2018 12:07:29 -0500
Subject: [PATCH] 330-WIP - adds the message decoder to see the P25 messages
 being decoded as we step through the recording.

---
 .../instrument/gui/viewer/decoder/P25Phase1Pane.java | 12 ++++++++++++
 .../dsheirer/module/decode/p25/P25_C4FMDecoder2.java |  3 +--
 .../decode/p25/P25_C4FMDecoder2Instrumented.java     |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/github/dsheirer/instrument/gui/viewer/decoder/P25Phase1Pane.java b/src/main/java/io/github/dsheirer/instrument/gui/viewer/decoder/P25Phase1Pane.java
index 42d9e813..1b3f31d9 100644
--- a/src/main/java/io/github/dsheirer/instrument/gui/viewer/decoder/P25Phase1Pane.java
+++ b/src/main/java/io/github/dsheirer/instrument/gui/viewer/decoder/P25Phase1Pane.java
@@ -20,9 +20,11 @@ import io.github.dsheirer.instrument.gui.viewer.chart.DoubleLineChart;
 import io.github.dsheirer.instrument.gui.viewer.chart.EyeDiagramChart;
 import io.github.dsheirer.instrument.gui.viewer.chart.PhaseLineChart;
 import io.github.dsheirer.instrument.gui.viewer.chart.SymbolChart;
+import io.github.dsheirer.message.Message;
 import io.github.dsheirer.module.decode.DecoderType;
 import io.github.dsheirer.module.decode.p25.P25_C4FMDecoder2Instrumented;
 import io.github.dsheirer.sample.Broadcaster;
+import io.github.dsheirer.sample.Listener;
 import io.github.dsheirer.sample.complex.ComplexBuffer;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Priority;
@@ -65,6 +67,16 @@ public class P25Phase1Pane extends DecoderPane
         HBox.setHgrow(getSampleChartBox(), Priority.ALWAYS);
         HBox.setHgrow(getDecoderChartBox(), Priority.ALWAYS);
         getChildren().addAll(getSampleChartBox(), getDecoderChartBox());
+
+        mDecoder.setMessageListener(new Listener<Message>()
+        {
+            @Override
+            public void receive(Message message)
+            {
+                mLog.debug(message.getMessage());
+            }
+        });
+
     }
 
     @Override
diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/P25_C4FMDecoder2.java b/src/main/java/io/github/dsheirer/module/decode/p25/P25_C4FMDecoder2.java
index 7ae55d67..dbd56609 100644
--- a/src/main/java/io/github/dsheirer/module/decode/p25/P25_C4FMDecoder2.java
+++ b/src/main/java/io/github/dsheirer/module/decode/p25/P25_C4FMDecoder2.java
@@ -42,10 +42,10 @@ public class P25_C4FMDecoder2 extends P25Decoder implements IComplexBufferListen
     protected InterpolatingSampleBuffer mInterpolatingSampleBuffer;
     protected DQPSKDemodulator mQPSKDemodulator;
     protected CostasLoop mCostasLoop;
+    protected P25MessageFramer mMessageFramer;
     protected double mSampleRate;
     private Map<Double,float[]> mBasebandFilters = new HashMap<>();
     private ComplexFIRFilter mBasebandFilter;
-    private P25MessageFramer mMessageFramer;
 
     public P25_C4FMDecoder2(AliasList aliasList)
     {
@@ -84,7 +84,6 @@ public class P25_C4FMDecoder2 extends P25Decoder implements IComplexBufferListen
     protected ComplexBuffer filter(ComplexBuffer complexBuffer)
     {
         return mBasebandFilter.filter(complexBuffer);
-//        return complexBuffer;
     }
 
     private double getSampleRate()
diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/P25_C4FMDecoder2Instrumented.java b/src/main/java/io/github/dsheirer/module/decode/p25/P25_C4FMDecoder2Instrumented.java
index 48b28e15..4877261f 100644
--- a/src/main/java/io/github/dsheirer/module/decode/p25/P25_C4FMDecoder2Instrumented.java
+++ b/src/main/java/io/github/dsheirer/module/decode/p25/P25_C4FMDecoder2Instrumented.java
@@ -69,6 +69,7 @@ public class P25_C4FMDecoder2Instrumented extends P25_C4FMDecoder2
         instrumented.setPLLFrequencyListener(mPLLFrequencyListener);
         instrumented.setSymbolDecisionDataListener(mSymbolDecisionDataListener);
         instrumented.setSamplesPerSymbolListener(mSamplesPerSymbolListener);
+        instrumented.setDibitListener(mMessageFramer);
     }
 
     public void setSymbolListener(Listener<Complex> listener)