From cb3be14515e717bad9a5c3691474053bbe9e825a Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Mon, 20 Jul 2020 02:07:40 +0200
Subject: [PATCH] Channel Analyzer: fixed sink initialization and removed
 unused baseband public set baseband sample rate

---
 plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp | 8 --------
 plugins/channelrx/chanalyzer/chanalyzerbaseband.h   | 1 -
 plugins/channelrx/chanalyzer/chanalyzersink.cpp     | 3 ++-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp b/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp
index 464246e8d..0eb425dab 100644
--- a/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp
+++ b/plugins/channelrx/chanalyzer/chanalyzerbaseband.cpp
@@ -175,11 +175,3 @@ int ChannelAnalyzerBaseband::getChannelSampleRate() const
 {
     return m_channelizer->getChannelSampleRate();
 }
-
-
-void ChannelAnalyzerBaseband::setBasebandSampleRate(int sampleRate)
-{
-    m_channelizer->setBasebandSampleRate(sampleRate);
-    int desiredSampleRate = getSinkSampleRate(m_settings);
-    m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), desiredSampleRate, m_channelizer->getChannelFrequencyOffset());
-}
\ No newline at end of file
diff --git a/plugins/channelrx/chanalyzer/chanalyzerbaseband.h b/plugins/channelrx/chanalyzer/chanalyzerbaseband.h
index 2298b6983..4a22d9a47 100644
--- a/plugins/channelrx/chanalyzer/chanalyzerbaseband.h
+++ b/plugins/channelrx/chanalyzer/chanalyzerbaseband.h
@@ -67,7 +67,6 @@ public:
     int getChannelSampleRate() const;
     double getMagSq() { return m_sink.getMagSq(); }
     double getMagSqAvg() const { return (double) m_sink.getMagSqAvg(); }
-    void setBasebandSampleRate(int sampleRate);
     void setSampleSink(BasebandSampleSink* sampleSink) { m_sink.setSampleSink(sampleSink); }
     bool isPllLocked() const { return m_sink.isPllLocked(); }
     Real getPllFrequency() const { return m_sink.getPllFrequency(); }
diff --git a/plugins/channelrx/chanalyzer/chanalyzersink.cpp b/plugins/channelrx/chanalyzer/chanalyzersink.cpp
index daca343ff..85f2e9392 100644
--- a/plugins/channelrx/chanalyzer/chanalyzersink.cpp
+++ b/plugins/channelrx/chanalyzer/chanalyzersink.cpp
@@ -29,6 +29,7 @@ const unsigned int ChannelAnalyzerSink::m_corrFFTLen = 4*m_ssbFftLen;
 ChannelAnalyzerSink::ChannelAnalyzerSink() :
     m_channelSampleRate(48000),
     m_channelFrequencyOffset(0),
+    m_sinkSampleRate(48000),
     m_sampleSink(nullptr)
 {
 	m_usb = true;
@@ -41,7 +42,7 @@ ChannelAnalyzerSink::ChannelAnalyzerSink() :
 	m_corr = new fftcorr(2*m_corrFFTLen); // 8k for 4k effective samples
 	m_pll.computeCoefficients(0.002f, 0.5f, 10.0f); // bandwidth, damping factor, loop gain
 
-    applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, true);
+    applyChannelSettings(m_channelSampleRate, m_sinkSampleRate, m_channelFrequencyOffset, true);
 	applySettings(m_settings, true);
 }