From 79b670d919d208fd4cc42fd0df3582b6548f0db3 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 1 May 2020 02:16:20 +0200
Subject: [PATCH] SpectrumVis: removed own configureDSP

---
 sdrbase/dsp/spectrumvis.cpp | 14 --------------
 sdrbase/dsp/spectrumvis.h   | 25 ++-----------------------
 2 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/sdrbase/dsp/spectrumvis.cpp b/sdrbase/dsp/spectrumvis.cpp
index ddac0392d..c3d54a6f9 100644
--- a/sdrbase/dsp/spectrumvis.cpp
+++ b/sdrbase/dsp/spectrumvis.cpp
@@ -36,7 +36,6 @@ inline double log2f(double n)
 #endif
 
 MESSAGE_CLASS_DEFINITION(SpectrumVis::MsgConfigureSpectrumVis, Message)
-MESSAGE_CLASS_DEFINITION(SpectrumVis::MsgConfigureDSP, Message)
 MESSAGE_CLASS_DEFINITION(SpectrumVis::MsgConfigureScalingFactor, Message)
 MESSAGE_CLASS_DEFINITION(SpectrumVis::MsgConfigureWSpectrumOpenClose, Message)
 MESSAGE_CLASS_DEFINITION(SpectrumVis::MsgConfigureWSpectrum, Message)
@@ -107,12 +106,6 @@ void SpectrumVis::configure(MessageQueue* msgQueue,
 	msgQueue->push(cmd);
 }
 
-void SpectrumVis::configureDSP(uint64_t centerFrequency, int sampleRate)
-{
-    MsgConfigureDSP* cmd = new MsgConfigureDSP(centerFrequency, sampleRate);
-    getInputMessageQueue()->push(cmd);
-}
-
 void SpectrumVis::setScalef(Real scalef)
 {
     MsgConfigureScalingFactor* cmd = new MsgConfigureScalingFactor(scalef);
@@ -653,13 +646,6 @@ bool SpectrumVis::handleMessage(const Message& message)
         applySettings(cfg.getSettings(), cfg.getForce());
 		return true;
 	}
-    else if (MsgConfigureDSP::match(message))
-    {
-        // This is coming from plugins GUI via configureDSP for auxiliary spectra
-        MsgConfigureDSP& conf = (MsgConfigureDSP&) message;
-        handleConfigureDSP(conf.getCenterFrequency(), conf.getSampleRate());
-        return true;
-    }
     else if (MsgConfigureScalingFactor::match(message))
     {
         MsgConfigureScalingFactor& conf = (MsgConfigureScalingFactor&) message;
diff --git a/sdrbase/dsp/spectrumvis.h b/sdrbase/dsp/spectrumvis.h
index ada238d03..a6247967e 100644
--- a/sdrbase/dsp/spectrumvis.h
+++ b/sdrbase/dsp/spectrumvis.h
@@ -87,7 +87,6 @@ public:
 	        AvgMode averagingMode,
 	        FFTWindow::Function window,
 	        bool m_linear);
-    void configureDSP(uint64_t centerFrequency, int sampleRate);
     void setScalef(Real scalef);
     void configureWSSpectrum(const QString& address, uint16_t port);
 
@@ -99,25 +98,6 @@ public:
 	virtual bool handleMessage(const Message& message);
 
 private:
-    class MsgConfigureDSP : public Message
-    {
-        MESSAGE_CLASS_DECLARATION
-
-    public:
-        MsgConfigureDSP(uint64_t centerFrequency, int sampleRate) :
-            Message(),
-            m_centerFrequency(centerFrequency),
-            m_sampleRate(sampleRate)
-        {}
-
-        uint64_t getCenterFrequency() const { return m_centerFrequency; }
-        int getSampleRate() const { return m_sampleRate; }
-
-    private:
-        uint64_t m_centerFrequency;
-        int m_sampleRate;
-    };
-
     class MsgConfigureScalingFactor : public Message
     {
 		MESSAGE_CLASS_DECLARATION
@@ -199,10 +179,9 @@ private:
 	QMutex m_mutex;
 
     void applySettings(const GLSpectrumSettings& settings, bool force = false);
-    void handleWSOpenClose(bool openClose);
-    void handleConfigureDSP(uint64_t centerFrequency,
-            int sampleRate);
+    void handleConfigureDSP(uint64_t centerFrequency, int sampleRate);
     void handleScalef(Real scalef);
+    void handleWSOpenClose(bool openClose);
     void handleConfigureWSSpectrum(const QString& address, uint16_t port);
 };