From 563c509c7c2c6f1efe244c370a83517782434f29 Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 30 Jun 2020 19:11:49 +0200 Subject: [PATCH] Initialize m_audioSampleRate in constructors where missing. Fixes #554 --- plugins/channelrx/demodam/amdemodsink.cpp | 1 + plugins/channelrx/demoddsd/dsddemodsink.cpp | 1 + plugins/channelrx/demodfreedv/freedvdemodsink.cpp | 1 + plugins/channelrx/demodssb/ssbdemodsink.cpp | 3 ++- plugins/channelrx/demodwfm/wfmdemodsink.cpp | 1 + plugins/channeltx/modfreedv/freedvmodsource.cpp | 1 + 6 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/channelrx/demodam/amdemodsink.cpp b/plugins/channelrx/demodam/amdemodsink.cpp index af48ebdc8..d47486535 100644 --- a/plugins/channelrx/demodam/amdemodsink.cpp +++ b/plugins/channelrx/demodam/amdemodsink.cpp @@ -28,6 +28,7 @@ AMDemodSink::AMDemodSink() : m_channelSampleRate(48000), + m_audioSampleRate(48000), m_channelFrequencyOffset(0), m_squelchCount(0), m_squelchOpen(false), diff --git a/plugins/channelrx/demoddsd/dsddemodsink.cpp b/plugins/channelrx/demoddsd/dsddemodsink.cpp index 9d8d23c4b..7462d2e34 100644 --- a/plugins/channelrx/demoddsd/dsddemodsink.cpp +++ b/plugins/channelrx/demoddsd/dsddemodsink.cpp @@ -40,6 +40,7 @@ DSDDemodSink::DSDDemodSink() : m_channelSampleRate(48000), + m_audioSampleRate(48000), m_channelFrequencyOffset(0), m_interpolatorDistance(0.0f), m_interpolatorDistanceRemain(0.0f), diff --git a/plugins/channelrx/demodfreedv/freedvdemodsink.cpp b/plugins/channelrx/demodfreedv/freedvdemodsink.cpp index fbb6ed27e..c2bd851d4 100644 --- a/plugins/channelrx/demodfreedv/freedvdemodsink.cpp +++ b/plugins/channelrx/demodfreedv/freedvdemodsink.cpp @@ -134,6 +134,7 @@ FreeDVDemodSink::FreeDVDemodSink() : m_channelSampleRate(48000), m_modemSampleRate(48000), m_speechSampleRate(8000), // fixed 8 kS/s + m_audioSampleRate(48000), m_channelFrequencyOffset(0), m_audioMute(false), m_simpleAGC(0.003f, 0.0f, 1e-6f), diff --git a/plugins/channelrx/demodssb/ssbdemodsink.cpp b/plugins/channelrx/demodssb/ssbdemodsink.cpp index ba140707f..24c44d1b2 100644 --- a/plugins/channelrx/demodssb/ssbdemodsink.cpp +++ b/plugins/channelrx/demodssb/ssbdemodsink.cpp @@ -47,7 +47,8 @@ SSBDemodSink::SSBDemodSink() : m_squelchDelayLine(2*48000), m_audioActive(false), m_spectrumSink(nullptr), - m_audioFifo(24000) + m_audioFifo(24000), + m_audioSampleRate(48000) { m_Bandwidth = 5000; m_LowCutoff = 300; diff --git a/plugins/channelrx/demodwfm/wfmdemodsink.cpp b/plugins/channelrx/demodwfm/wfmdemodsink.cpp index c9c72ac4e..37fbb0ab7 100644 --- a/plugins/channelrx/demodwfm/wfmdemodsink.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodsink.cpp @@ -33,6 +33,7 @@ const unsigned int WFMDemodSink::m_rfFilterFftLength = 1024; WFMDemodSink::WFMDemodSink() : m_channelSampleRate(384000), + m_audioSampleRate(48000), m_channelFrequencyOffset(0), m_squelchOpen(false), m_magsq(0.0f), diff --git a/plugins/channeltx/modfreedv/freedvmodsource.cpp b/plugins/channeltx/modfreedv/freedvmodsource.cpp index 75162cc93..a66034478 100644 --- a/plugins/channeltx/modfreedv/freedvmodsource.cpp +++ b/plugins/channeltx/modfreedv/freedvmodsource.cpp @@ -29,6 +29,7 @@ FreeDVModSource::FreeDVModSource() : m_channelSampleRate(48000), m_channelFrequencyOffset(0), m_modemSampleRate(48000), // // default 2400A mode + m_audioSampleRate(48000), m_lowCutoff(0.0), m_hiCutoff(6000.0), m_SSBFilter(nullptr),