From 74f63d0e84bf26a237d7af8e829930346dcd5f9c Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Sun, 4 Apr 2021 22:16:44 -0400 Subject: [PATCH] Cleanup: analog modems --- src/modules/modem/analog/ModemAM.cpp | 2 +- src/modules/modem/analog/ModemAM.h | 8 ++++---- src/modules/modem/analog/ModemCW.cpp | 6 +++--- src/modules/modem/analog/ModemCW.h | 24 +++++++++++----------- src/modules/modem/analog/ModemDSB.cpp | 2 +- src/modules/modem/analog/ModemDSB.h | 8 ++++---- src/modules/modem/analog/ModemFM.cpp | 2 +- src/modules/modem/analog/ModemFM.h | 8 ++++---- src/modules/modem/analog/ModemFMStereo.cpp | 6 +++--- src/modules/modem/analog/ModemFMStereo.h | 22 ++++++++++---------- src/modules/modem/analog/ModemIQ.cpp | 6 ++---- src/modules/modem/analog/ModemIQ.h | 14 ++++++------- src/modules/modem/analog/ModemLSB.cpp | 2 +- src/modules/modem/analog/ModemLSB.h | 10 ++++----- src/modules/modem/analog/ModemNBFM.cpp | 2 +- src/modules/modem/analog/ModemNBFM.h | 8 ++++---- src/modules/modem/analog/ModemUSB.cpp | 2 +- src/modules/modem/analog/ModemUSB.h | 10 ++++----- 18 files changed, 70 insertions(+), 72 deletions(-) diff --git a/src/modules/modem/analog/ModemAM.cpp b/src/modules/modem/analog/ModemAM.cpp index e9c49d7..7cb8270 100644 --- a/src/modules/modem/analog/ModemAM.cpp +++ b/src/modules/modem/analog/ModemAM.cpp @@ -27,7 +27,7 @@ int ModemAM::getDefaultSampleRate() { } void ModemAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput* audioOut) { - ModemKitAnalog *amkit = (ModemKitAnalog *)kit; + auto *amkit = (ModemKitAnalog *)kit; initOutputBuffers(amkit,input); diff --git a/src/modules/modem/analog/ModemAM.h b/src/modules/modem/analog/ModemAM.h index fd3496e..abee686 100644 --- a/src/modules/modem/analog/ModemAM.h +++ b/src/modules/modem/analog/ModemAM.h @@ -8,15 +8,15 @@ class ModemAM : public ModemAnalog { public: ModemAM(); - ~ModemAM(); + ~ModemAM() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - int getDefaultSampleRate(); + int getDefaultSampleRate() override; - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: firfilt_rrrf mDCBlock; diff --git a/src/modules/modem/analog/ModemCW.cpp b/src/modules/modem/analog/ModemCW.cpp index acb40f4..24c5e6f 100644 --- a/src/modules/modem/analog/ModemCW.cpp +++ b/src/modules/modem/analog/ModemCW.cpp @@ -116,7 +116,7 @@ int ModemCW::getDefaultSampleRate() { // the input IQ to audioOut, frequency shift, then pass the real part. // Simple solution is just interpolate the IQ data to the audio sample rate. ModemKit *ModemCW::buildKit(long long sampleRate, int audioSampleRate) { - ModemKitCW *kit = new ModemKitCW(); + auto *kit = new ModemKitCW(); float As = 60.0f; double ratio = double(audioSampleRate) / double(sampleRate); kit->sampleRate = sampleRate; @@ -127,7 +127,7 @@ ModemKit *ModemCW::buildKit(long long sampleRate, int audioSampleRate) { } void ModemCW::disposeKit(ModemKit *kit) { - ModemKitCW *cwkit = (ModemKitCW *) kit; + auto *cwkit = (ModemKitCW *) kit; msresamp_cccf_destroy(cwkit->mInputResampler); delete kit; } @@ -156,7 +156,7 @@ void ModemCW::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *au unsigned int outSize; float lsb; liquid_float_complex sig; - ModemKitCW *cwkit = (ModemKitCW *) kit; + auto *cwkit = (ModemKitCW *) kit; initOutputBuffers(cwkit, input); diff --git a/src/modules/modem/analog/ModemCW.h b/src/modules/modem/analog/ModemCW.h index 522ca23..759955a 100644 --- a/src/modules/modem/analog/ModemCW.h +++ b/src/modules/modem/analog/ModemCW.h @@ -17,32 +17,32 @@ class ModemCW : public ModemAnalog { public: ModemCW(); - ~ModemCW(); + ~ModemCW() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - int checkSampleRate(long long srate, int arate); + int checkSampleRate(long long srate, int arate) override; - ModemKit *buildKit(long long srate, int arate); + ModemKit *buildKit(long long srate, int arate) override; - void disposeKit(ModemKit *kit); + void disposeKit(ModemKit *kit) override; - void initOutputBuffers(ModemKitAnalog *akit, ModemIQData *input); + void initOutputBuffers(ModemKitAnalog *akit, ModemIQData *input) override; - int getDefaultSampleRate(); + int getDefaultSampleRate() override; - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; - ModemArgInfoList getSettings(); + ModemArgInfoList getSettings() override; - void writeSetting(std::string setting, std::string value); + void writeSetting(std::string setting, std::string value) override; - std::string readSetting(std::string setting); + std::string readSetting(std::string setting) override; // No resampling required. - std::vector *getResampledOutputData() { return &demodOutputData; } + std::vector *getResampledOutputData() override { return &demodOutputData; } private: float mBeepFrequency; diff --git a/src/modules/modem/analog/ModemDSB.cpp b/src/modules/modem/analog/ModemDSB.cpp index 298b1d1..d8f4beb 100644 --- a/src/modules/modem/analog/ModemDSB.cpp +++ b/src/modules/modem/analog/ModemDSB.cpp @@ -25,7 +25,7 @@ int ModemDSB::getDefaultSampleRate() { } void ModemDSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { - ModemKitAnalog *amkit = (ModemKitAnalog *)kit; + auto *amkit = (ModemKitAnalog *)kit; initOutputBuffers(amkit, input); diff --git a/src/modules/modem/analog/ModemDSB.h b/src/modules/modem/analog/ModemDSB.h index 2645d13..64ce4af 100644 --- a/src/modules/modem/analog/ModemDSB.h +++ b/src/modules/modem/analog/ModemDSB.h @@ -8,15 +8,15 @@ class ModemDSB : public ModemAnalog { public: ModemDSB(); - ~ModemDSB(); + ~ModemDSB() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - int getDefaultSampleRate(); + int getDefaultSampleRate() override; - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: ampmodem demodAM_DSB; diff --git a/src/modules/modem/analog/ModemFM.cpp b/src/modules/modem/analog/ModemFM.cpp index cf20709..2d78079 100644 --- a/src/modules/modem/analog/ModemFM.cpp +++ b/src/modules/modem/analog/ModemFM.cpp @@ -24,7 +24,7 @@ int ModemFM::getDefaultSampleRate() { } void ModemFM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { - ModemKitAnalog *fmkit = (ModemKitAnalog *)kit; + auto *fmkit = (ModemKitAnalog *)kit; initOutputBuffers(fmkit, input); diff --git a/src/modules/modem/analog/ModemFM.h b/src/modules/modem/analog/ModemFM.h index 2e08a1a..500fd0f 100644 --- a/src/modules/modem/analog/ModemFM.h +++ b/src/modules/modem/analog/ModemFM.h @@ -8,15 +8,15 @@ class ModemFM : public ModemAnalog { public: ModemFM(); - ~ModemFM(); + ~ModemFM() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - int getDefaultSampleRate(); + int getDefaultSampleRate() override; - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: freqdem demodFM; diff --git a/src/modules/modem/analog/ModemFMStereo.cpp b/src/modules/modem/analog/ModemFMStereo.cpp index 6d37a67..a9726f6 100644 --- a/src/modules/modem/analog/ModemFMStereo.cpp +++ b/src/modules/modem/analog/ModemFMStereo.cpp @@ -87,7 +87,7 @@ std::string ModemFMStereo::readSetting(std::string setting) { } ModemKit *ModemFMStereo::buildKit(long long sampleRate, int audioSampleRate) { - ModemKitFMStereo *kit = new ModemKitFMStereo; + auto *kit = new ModemKitFMStereo; kit->audioResampleRatio = double(audioSampleRate) / double(sampleRate); kit->sampleRate = sampleRate; @@ -161,7 +161,7 @@ ModemKit *ModemFMStereo::buildKit(long long sampleRate, int audioSampleRate) { } void ModemFMStereo::disposeKit(ModemKit *kit) { - ModemKitFMStereo *fmkit = (ModemKitFMStereo *)kit; + auto *fmkit = (ModemKitFMStereo *)kit; msresamp_rrrf_destroy(fmkit->audioResampler); msresamp_rrrf_destroy(fmkit->stereoResampler); @@ -176,7 +176,7 @@ void ModemFMStereo::disposeKit(ModemKit *kit) { void ModemFMStereo::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { - ModemKitFMStereo *fmkit = (ModemKitFMStereo *)kit; + auto *fmkit = (ModemKitFMStereo *)kit; size_t bufSize = input->data.size(); liquid_float_complex u, v, w, x, y; diff --git a/src/modules/modem/analog/ModemFMStereo.h b/src/modules/modem/analog/ModemFMStereo.h index 1c8bd85..ccbcb93 100644 --- a/src/modules/modem/analog/ModemFMStereo.h +++ b/src/modules/modem/analog/ModemFMStereo.h @@ -31,24 +31,24 @@ public: class ModemFMStereo : public Modem { public: ModemFMStereo(); - ~ModemFMStereo(); + ~ModemFMStereo() override; - std::string getType(); - std::string getName(); + std::string getType() override; + std::string getName() override; static ModemBase *factory(); - int checkSampleRate(long long sampleRate, int audioSampleRate); - int getDefaultSampleRate(); + int checkSampleRate(long long sampleRate, int audioSampleRate) override; + int getDefaultSampleRate() override; - ModemArgInfoList getSettings(); - void writeSetting(std::string setting, std::string value); - std::string readSetting(std::string setting); + ModemArgInfoList getSettings() override; + void writeSetting(std::string setting, std::string value) override; + std::string readSetting(std::string setting) override; - ModemKit *buildKit(long long sampleRate, int audioSampleRate); - void disposeKit(ModemKit *kit); + ModemKit *buildKit(long long sampleRate, int audioSampleRate) override; + void disposeKit(ModemKit *kit) override; - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: std::vector demodOutputData; diff --git a/src/modules/modem/analog/ModemIQ.cpp b/src/modules/modem/analog/ModemIQ.cpp index 81af37d..81098f2 100644 --- a/src/modules/modem/analog/ModemIQ.cpp +++ b/src/modules/modem/analog/ModemIQ.cpp @@ -3,9 +3,7 @@ #include "ModemIQ.h" -ModemIQ::ModemIQ() { - -} +ModemIQ::ModemIQ() = default; std::string ModemIQ::getType() { return "analog"; @@ -20,7 +18,7 @@ ModemBase *ModemIQ::factory() { } ModemKit *ModemIQ::buildKit(long long sampleRate, int audioSampleRate) { - ModemKit *kit = new ModemKit; + auto *kit = new ModemKit; kit->sampleRate = sampleRate; kit->audioSampleRate = audioSampleRate; return kit; diff --git a/src/modules/modem/analog/ModemIQ.h b/src/modules/modem/analog/ModemIQ.h index 30a551b..6885707 100644 --- a/src/modules/modem/analog/ModemIQ.h +++ b/src/modules/modem/analog/ModemIQ.h @@ -8,19 +8,19 @@ class ModemIQ : public Modem { public: ModemIQ(); - std::string getType(); - std::string getName(); + std::string getType() override; + std::string getName() override; static ModemBase *factory(); - int checkSampleRate(long long sampleRate, int audioSampleRate); - int getDefaultSampleRate(); + int checkSampleRate(long long sampleRate, int audioSampleRate) override; + int getDefaultSampleRate() override; - ModemKit *buildKit(long long sampleRate, int audioSampleRate); + ModemKit *buildKit(long long sampleRate, int audioSampleRate) override; - void disposeKit(ModemKit *kit); + void disposeKit(ModemKit *kit) override; - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: diff --git a/src/modules/modem/analog/ModemLSB.cpp b/src/modules/modem/analog/ModemLSB.cpp index bc417b4..ef23b7b 100644 --- a/src/modules/modem/analog/ModemLSB.cpp +++ b/src/modules/modem/analog/ModemLSB.cpp @@ -41,7 +41,7 @@ int ModemLSB::getDefaultSampleRate() { } void ModemLSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { - ModemKitAnalog *akit = (ModemKitAnalog *)kit; + auto *akit = (ModemKitAnalog *)kit; initOutputBuffers(akit,input); diff --git a/src/modules/modem/analog/ModemLSB.h b/src/modules/modem/analog/ModemLSB.h index 9804edf..5e6f72c 100644 --- a/src/modules/modem/analog/ModemLSB.h +++ b/src/modules/modem/analog/ModemLSB.h @@ -7,16 +7,16 @@ class ModemLSB : public ModemAnalog { public: ModemLSB(); - ~ModemLSB(); + ~ModemLSB() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - int checkSampleRate(long long sampleRate, int audioSampleRate); - int getDefaultSampleRate(); + int checkSampleRate(long long sampleRate, int audioSampleRate) override; + int getDefaultSampleRate() override; - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: iirfilt_crcf ssbFilt; diff --git a/src/modules/modem/analog/ModemNBFM.cpp b/src/modules/modem/analog/ModemNBFM.cpp index 84e3202..ddb8f73 100644 --- a/src/modules/modem/analog/ModemNBFM.cpp +++ b/src/modules/modem/analog/ModemNBFM.cpp @@ -24,7 +24,7 @@ int ModemNBFM::getDefaultSampleRate() { } void ModemNBFM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { - ModemKitAnalog *fmkit = (ModemKitAnalog *)kit; + auto *fmkit = (ModemKitAnalog *)kit; initOutputBuffers(fmkit, input); diff --git a/src/modules/modem/analog/ModemNBFM.h b/src/modules/modem/analog/ModemNBFM.h index 52d34ad..09cf833 100644 --- a/src/modules/modem/analog/ModemNBFM.h +++ b/src/modules/modem/analog/ModemNBFM.h @@ -8,15 +8,15 @@ class ModemNBFM : public ModemAnalog { public: ModemNBFM(); - ~ModemNBFM(); + ~ModemNBFM() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - int getDefaultSampleRate(); + int getDefaultSampleRate() override; - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: freqdem demodFM; diff --git a/src/modules/modem/analog/ModemUSB.cpp b/src/modules/modem/analog/ModemUSB.cpp index 940cbb3..2732550 100644 --- a/src/modules/modem/analog/ModemUSB.cpp +++ b/src/modules/modem/analog/ModemUSB.cpp @@ -41,7 +41,7 @@ int ModemUSB::getDefaultSampleRate() { } void ModemUSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { - ModemKitAnalog *akit = (ModemKitAnalog *)kit; + auto *akit = (ModemKitAnalog *)kit; initOutputBuffers(akit,input); diff --git a/src/modules/modem/analog/ModemUSB.h b/src/modules/modem/analog/ModemUSB.h index 7c86ed3..3cf408a 100644 --- a/src/modules/modem/analog/ModemUSB.h +++ b/src/modules/modem/analog/ModemUSB.h @@ -7,16 +7,16 @@ class ModemUSB : public ModemAnalog { public: ModemUSB(); - ~ModemUSB(); + ~ModemUSB() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - int checkSampleRate(long long sampleRate, int audioSampleRate); - int getDefaultSampleRate(); + int checkSampleRate(long long sampleRate, int audioSampleRate) override; + int getDefaultSampleRate() override; - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: iirfilt_crcf ssbFilt;