From 5c6984899e9715b1971d4bef1dad16f5a5e08454 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 5 Jan 2018 19:14:27 +0100 Subject: [PATCH] AM, SSB demod, SSB mod: fixed interpolator setting in apply channel settings. Fixes issue #117 --- plugins/channelrx/demodam/amdemod.cpp | 2 +- plugins/channelrx/demodssb/ssbdemod.cpp | 2 +- plugins/channeltx/modssb/ssbmod.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index 1047ec9a7..78b2e625c 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -196,7 +196,7 @@ void AMDemod::applyChannelSettings(int inputSampleRate, int inputFrequencyOffset if (m_inputSampleRate != inputSampleRate) { m_settingsMutex.lock(); - m_interpolator.create(16, m_inputSampleRate, m_settings.m_rfBandwidth / 2.2f); + m_interpolator.create(16, inputSampleRate, m_settings.m_rfBandwidth / 2.2f); m_interpolatorDistanceRemain = 0; m_interpolatorDistance = (Real) inputSampleRate / (Real) m_settings.m_audioSampleRate; m_settingsMutex.unlock(); diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index 3381105a1..f58469e4c 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -348,7 +348,7 @@ void SSBDemod::applyChannelSettings(int inputSampleRate, int inputFrequencyOffse if (m_inputSampleRate != inputSampleRate) { m_settingsMutex.lock(); - m_interpolator.create(16, m_inputSampleRate, m_Bandwidth / 2.2f); + m_interpolator.create(16, inputSampleRate, m_Bandwidth / 2.2f); m_interpolatorDistanceRemain = 0; m_interpolatorDistance = (Real) inputSampleRate / (Real) m_settings.m_audioSampleRate; m_settingsMutex.unlock(); diff --git a/plugins/channeltx/modssb/ssbmod.cpp b/plugins/channeltx/modssb/ssbmod.cpp index daaa2595a..be668c836 100644 --- a/plugins/channeltx/modssb/ssbmod.cpp +++ b/plugins/channeltx/modssb/ssbmod.cpp @@ -665,7 +665,7 @@ void SSBMod::applyChannelSettings(int basebandSampleRate, int outputSampleRate, m_settingsMutex.lock(); m_interpolatorDistanceRemain = 0; m_interpolatorConsumed = false; - m_interpolatorDistance = (Real) m_settings.m_audioSampleRate / (Real) m_outputSampleRate; + m_interpolatorDistance = (Real) m_settings.m_audioSampleRate / (Real) outputSampleRate; m_interpolator.create(48, m_settings.m_audioSampleRate, m_settings.m_bandwidth, 3.0); m_settingsMutex.unlock(); }