From 0af04cf66f32ad242a5b33fe9a2782c5c87a2256 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Tue, 9 Jan 2018 00:40:48 +0100
Subject: [PATCH] SSB Demod: call applyChannelSettings with force=true at
 construction and start. Corrected decimator filter cutoff

---
 plugins/channelrx/demodssb/ssbdemod.cpp  | 12 +++++++-----
 plugins/channelrx/demodssb/ssbdemod.h    |  2 +-
 plugins/channelrx/demodssb/ssbplugin.cpp |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp
index f58469e4c..f76bdfbcd 100644
--- a/plugins/channelrx/demodssb/ssbdemod.cpp
+++ b/plugins/channelrx/demodssb/ssbdemod.cpp
@@ -91,6 +91,7 @@ SSBDemod::SSBDemod(DeviceSourceAPI *deviceAPI) :
     m_deviceAPI->addThreadedSink(m_threadedChannelizer);
     m_deviceAPI->addChannelAPI(this);
 
+    applyChannelSettings(m_inputSampleRate, m_inputFrequencyOffset, true);
 	applySettings(m_settings, true);
 }
 
@@ -282,6 +283,7 @@ void SSBDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto
 
 void SSBDemod::start()
 {
+    applyChannelSettings(m_inputSampleRate, m_inputFrequencyOffset, true);
 }
 
 void SSBDemod::stop()
@@ -333,22 +335,22 @@ bool SSBDemod::handleMessage(const Message& cmd)
 	}
 }
 
-void SSBDemod::applyChannelSettings(int inputSampleRate, int inputFrequencyOffset)
+void SSBDemod::applyChannelSettings(int inputSampleRate, int inputFrequencyOffset, bool force)
 {
     qDebug() << "SSBDemod::applyChannelSettings:"
             << " inputSampleRate: " << inputSampleRate
             << " inputFrequencyOffset: " << inputFrequencyOffset;
 
     if ((m_inputFrequencyOffset != inputFrequencyOffset) ||
-        (m_inputSampleRate != inputSampleRate))
+        (m_inputSampleRate != inputSampleRate) || force)
     {
         m_nco.setFreq(-inputFrequencyOffset, inputSampleRate);
     }
 
-    if (m_inputSampleRate != inputSampleRate)
+    if ((m_inputSampleRate != inputSampleRate) || force)
     {
         m_settingsMutex.lock();
-        m_interpolator.create(16, inputSampleRate, m_Bandwidth / 2.2f);
+        m_interpolator.create(16, inputSampleRate, m_Bandwidth * 1.3f);
         m_interpolatorDistanceRemain = 0;
         m_interpolatorDistance = (Real) inputSampleRate / (Real) m_settings.m_audioSampleRate;
         m_settingsMutex.unlock();
@@ -405,7 +407,7 @@ void SSBDemod::applySettings(const SSBDemodSettings& settings, bool force)
         m_LowCutoff = lowCutoff;
 
         m_settingsMutex.lock();
-        m_interpolator.create(16, m_inputSampleRate, m_Bandwidth / 2.2f);
+        m_interpolator.create(16, m_inputSampleRate, m_Bandwidth * 1.3f);
         m_interpolatorDistanceRemain = 0;
         m_interpolatorDistance = (Real) m_inputSampleRate / (Real) m_settings.m_audioSampleRate;
         SSBFilter->create_filter(m_LowCutoff / (float) m_audioSampleRate, m_Bandwidth / (float) m_audioSampleRate);
diff --git a/plugins/channelrx/demodssb/ssbdemod.h b/plugins/channelrx/demodssb/ssbdemod.h
index af90d7a3c..a8fa5e0d9 100644
--- a/plugins/channelrx/demodssb/ssbdemod.h
+++ b/plugins/channelrx/demodssb/ssbdemod.h
@@ -279,7 +279,7 @@ private:
 
 	QMutex m_settingsMutex;
 
-	void applyChannelSettings(int inputSampleRate, int inputFrequencyOffset);
+	void applyChannelSettings(int inputSampleRate, int inputFrequencyOffset, bool force = false);
 	void applySettings(const SSBDemodSettings& settings, bool force = false);
 };
 
diff --git a/plugins/channelrx/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp
index f4a9644a7..ba8cbb096 100644
--- a/plugins/channelrx/demodssb/ssbplugin.cpp
+++ b/plugins/channelrx/demodssb/ssbplugin.cpp
@@ -8,7 +8,7 @@
 
 const PluginDescriptor SSBPlugin::m_pluginDescriptor = {
 	QString("SSB Demodulator"),
-	QString("3.9.0"),
+	QString("3.10.1"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,