From 125930ca7cb6b4dc11730707dae63895b11f2de0 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Mon, 24 Aug 2020 23:27:52 +0200
Subject: [PATCH] UDP Source: restore spectrum display

---
 .../channeltx/udpsource/udpsourcesource.cpp   | 21 +++++++------------
 plugins/channeltx/udpsource/udpsourcesource.h |  2 --
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/plugins/channeltx/udpsource/udpsourcesource.cpp b/plugins/channeltx/udpsource/udpsourcesource.cpp
index 366b4ef30..0fcdc7356 100644
--- a/plugins/channeltx/udpsource/udpsourcesource.cpp
+++ b/plugins/channeltx/udpsource/udpsourcesource.cpp
@@ -29,7 +29,6 @@ UDPSourceSource::UDPSourceSource() :
     m_channelFrequencyOffset(0),
     m_squelch(1e-6),
     m_spectrumSink(nullptr),
-    m_spectrumEnabled(false),
     m_spectrumChunkSize(2160),
     m_spectrumChunkCounter(0),
     m_magsq(1e-10),
@@ -238,19 +237,20 @@ void UDPSourceSource::modulateSample()
         initSquelch(false);
     }
 
-    if (m_spectrumSink && m_spectrumEnabled && (m_spectrumChunkCounter < m_spectrumChunkSize - 1))
+    if (m_spectrumSink)
     {
         Sample s;
         s.m_real = (FixReal) m_modSample.real();
         s.m_imag = (FixReal) m_modSample.imag();
         m_sampleBuffer.push_back(s);
         m_spectrumChunkCounter++;
-    }
-    else if (m_spectrumSink)
-    {
-        m_spectrumSink->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), false);
-        m_sampleBuffer.clear();
-        m_spectrumChunkCounter = 0;
+
+        if (m_spectrumChunkCounter == m_spectrumChunkSize)
+        {
+            m_spectrumSink->feed(m_sampleBuffer.begin(), m_sampleBuffer.end(), false);
+            m_sampleBuffer.clear();
+            m_spectrumChunkCounter = 0;
+        }
     }
 }
 
@@ -292,11 +292,6 @@ void UDPSourceSource::calculateLevel(Complex sample)
     }
 }
 
-void UDPSourceSource::setSpectrumEnabled(bool enabled)
-{
-    m_spectrumEnabled = enabled;
-}
-
 void UDPSourceSource::resetReadIndex()
 {
     m_udpHandler.resetReadIndex();
diff --git a/plugins/channeltx/udpsource/udpsourcesource.h b/plugins/channeltx/udpsource/udpsourcesource.h
index 8f634c007..adb3aa91e 100644
--- a/plugins/channeltx/udpsource/udpsourcesource.h
+++ b/plugins/channeltx/udpsource/udpsourcesource.h
@@ -49,7 +49,6 @@ public:
     int32_t getBufferGauge() const { return m_udpHandler.getBufferGauge(); }
     bool getSquelchOpen() const { return m_squelchOpen; }
 
-    void setSpectrumEnabled(bool enabled);
     void resetReadIndex();
 
     void applyChannelSettings(int channelSampleRate, int channelFrequencyOffset, bool force = false);
@@ -75,7 +74,6 @@ private:
     Complex m_modSample;
 
     BasebandSampleSink* m_spectrumSink;
-    bool m_spectrumEnabled;
     SampleVector m_sampleBuffer;
     int m_spectrumChunkSize;
     int m_spectrumChunkCounter;