diff --git a/src/modules/modem/digital/ModemAPSK.cpp b/src/modules/modem/digital/ModemAPSK.cpp index 997756a..8952cf0 100644 --- a/src/modules/modem/digital/ModemAPSK.cpp +++ b/src/modules/modem/digital/ModemAPSK.cpp @@ -70,9 +70,9 @@ std::string ModemAPSK::readSetting(std::string setting) { return ""; } -void ModemAPSK::updateDemodulatorCons(int cons) { - this->cons = cons; - switch (cons) { +void ModemAPSK::updateDemodulatorCons(int cons_in) { + cons = cons_in; + switch (cons_in) { case 4: demodAPSK = demodAPSK4; break; @@ -98,7 +98,7 @@ void ModemAPSK::updateDemodulatorCons(int cons) { } void ModemAPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitDigital *dkit = (ModemKitDigital *)kit; + auto *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodAPSK, input); diff --git a/src/modules/modem/digital/ModemAPSK.h b/src/modules/modem/digital/ModemAPSK.h index 4ebf379..9dbafbb 100644 --- a/src/modules/modem/digital/ModemAPSK.h +++ b/src/modules/modem/digital/ModemAPSK.h @@ -7,18 +7,18 @@ class ModemAPSK : public ModemDigital { public: ModemAPSK(); - ~ModemAPSK(); + ~ModemAPSK() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - 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; - void updateDemodulatorCons(int cons); - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void updateDemodulatorCons(int cons_in); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: int cons; diff --git a/src/modules/modem/digital/ModemASK.cpp b/src/modules/modem/digital/ModemASK.cpp index d0b494c..3b330a9 100644 --- a/src/modules/modem/digital/ModemASK.cpp +++ b/src/modules/modem/digital/ModemASK.cpp @@ -72,9 +72,9 @@ std::string ModemASK::readSetting(std::string setting) { return ""; } -void ModemASK::updateDemodulatorCons(int cons) { - this->cons = cons; - switch (cons) { +void ModemASK::updateDemodulatorCons(int cons_in) { + cons = cons_in; + switch (cons_in) { case 2: demodASK = demodASK2; break; @@ -103,7 +103,7 @@ void ModemASK::updateDemodulatorCons(int cons) { } void ModemASK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitDigital *dkit = (ModemKitDigital *)kit; + auto *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodASK, input); diff --git a/src/modules/modem/digital/ModemASK.h b/src/modules/modem/digital/ModemASK.h index af9f1d1..cc692d0 100644 --- a/src/modules/modem/digital/ModemASK.h +++ b/src/modules/modem/digital/ModemASK.h @@ -7,18 +7,18 @@ class ModemASK : public ModemDigital { public: ModemASK(); - ~ModemASK(); + ~ModemASK() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - 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; - void updateDemodulatorCons(int cons); - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void updateDemodulatorCons(int cons_in); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: int cons; diff --git a/src/modules/modem/digital/ModemBPSK.cpp b/src/modules/modem/digital/ModemBPSK.cpp index cd7cbca..e8eca7a 100644 --- a/src/modules/modem/digital/ModemBPSK.cpp +++ b/src/modules/modem/digital/ModemBPSK.cpp @@ -20,7 +20,7 @@ std::string ModemBPSK::getName() { } void ModemBPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitDigital *dkit = (ModemKitDigital *)kit; + auto *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodBPSK, input); for (size_t i = 0, bufSize=input->data.size(); i < bufSize; i++) { diff --git a/src/modules/modem/digital/ModemBPSK.h b/src/modules/modem/digital/ModemBPSK.h index 70719c3..08917af 100644 --- a/src/modules/modem/digital/ModemBPSK.h +++ b/src/modules/modem/digital/ModemBPSK.h @@ -7,13 +7,13 @@ class ModemBPSK : public ModemDigital { public: ModemBPSK(); - ~ModemBPSK(); + ~ModemBPSK() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: modem demodBPSK; diff --git a/src/modules/modem/digital/ModemDPSK.cpp b/src/modules/modem/digital/ModemDPSK.cpp index 38f43ed..55acf9c 100644 --- a/src/modules/modem/digital/ModemDPSK.cpp +++ b/src/modules/modem/digital/ModemDPSK.cpp @@ -73,9 +73,9 @@ std::string ModemDPSK::readSetting(std::string setting) { return ""; } -void ModemDPSK::updateDemodulatorCons(int cons) { - this->cons = cons; - switch (cons) { +void ModemDPSK::updateDemodulatorCons(int cons_in) { + cons = cons_in; + switch (cons_in) { case 2: demodDPSK = demodDPSK2; break; @@ -104,7 +104,7 @@ void ModemDPSK::updateDemodulatorCons(int cons) { } void ModemDPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitDigital *dkit = (ModemKitDigital *)kit; + auto *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodDPSK, input); diff --git a/src/modules/modem/digital/ModemDPSK.h b/src/modules/modem/digital/ModemDPSK.h index dbb24a0..1b30623 100644 --- a/src/modules/modem/digital/ModemDPSK.h +++ b/src/modules/modem/digital/ModemDPSK.h @@ -7,18 +7,18 @@ class ModemDPSK : public ModemDigital { public: ModemDPSK(); - ~ModemDPSK(); + ~ModemDPSK() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - 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; - void updateDemodulatorCons(int cons); - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void updateDemodulatorCons(int cons_in); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: int cons; diff --git a/src/modules/modem/digital/ModemFSK.cpp b/src/modules/modem/digital/ModemFSK.cpp index 1a63e2c..4d53483 100644 --- a/src/modules/modem/digital/ModemFSK.cpp +++ b/src/modules/modem/digital/ModemFSK.cpp @@ -99,7 +99,7 @@ std::string ModemFSK::readSetting(std::string setting) { } ModemKit *ModemFSK::buildKit(long long sampleRate, int audioSampleRate) { - ModemKitFSK *dkit = new ModemKitFSK; + auto *dkit = new ModemKitFSK; dkit->m = bps; dkit->k = (unsigned int)(sampleRate / sps); dkit->bw = bw; @@ -113,7 +113,7 @@ ModemKit *ModemFSK::buildKit(long long sampleRate, int audioSampleRate) { } void ModemFSK::disposeKit(ModemKit *kit) { - ModemKitFSK *dkit = (ModemKitFSK *)kit; + auto *dkit = (ModemKitFSK *)kit; fskdem_destroy(dkit->demodFSK); @@ -124,12 +124,10 @@ std::string ModemFSK::getName() { return "FSK"; } -ModemFSK::~ModemFSK() { - -} +ModemFSK::~ModemFSK() = default; void ModemFSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitFSK *dkit = (ModemKitFSK *)kit; + auto *dkit = (ModemKitFSK *)kit; digitalStart(dkit, nullptr, input); diff --git a/src/modules/modem/digital/ModemFSK.h b/src/modules/modem/digital/ModemFSK.h index 6f8846e..29b465e 100644 --- a/src/modules/modem/digital/ModemFSK.h +++ b/src/modules/modem/digital/ModemFSK.h @@ -18,23 +18,23 @@ public: class ModemFSK : public ModemDigital { public: ModemFSK(); - ~ModemFSK(); + ~ModemFSK() 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; - 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: int sps, bps; diff --git a/src/modules/modem/digital/ModemGMSK.cpp b/src/modules/modem/digital/ModemGMSK.cpp index b94932d..cacae09 100644 --- a/src/modules/modem/digital/ModemGMSK.cpp +++ b/src/modules/modem/digital/ModemGMSK.cpp @@ -11,9 +11,7 @@ ModemGMSK::ModemGMSK() : ModemDigital() { outStream << std::hex; } -ModemGMSK::~ModemGMSK() { - -} +ModemGMSK::~ModemGMSK() = default; std::string ModemGMSK::getName() { return "GMSK"; @@ -94,7 +92,7 @@ std::string ModemGMSK::readSetting(std::string setting) { } ModemKit *ModemGMSK::buildKit(long long sampleRate, int audioSampleRate) { - ModemKitGMSK *dkit = new ModemKitGMSK; + auto *dkit = new ModemKitGMSK; dkit->sps = _sps; dkit->fdelay = _fdelay; dkit->ebf = _ebf; @@ -108,7 +106,7 @@ ModemKit *ModemGMSK::buildKit(long long sampleRate, int audioSampleRate) { } void ModemGMSK::disposeKit(ModemKit *kit) { - ModemKitGMSK *dkit = (ModemKitGMSK *)kit; + auto *dkit = (ModemKitGMSK *)kit; gmskdem_destroy(dkit->demodGMSK); @@ -116,7 +114,7 @@ void ModemGMSK::disposeKit(ModemKit *kit) { } void ModemGMSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitGMSK *dkit = (ModemKitGMSK *)kit; + auto *dkit = (ModemKitGMSK *)kit; unsigned int sym_out; digitalStart(dkit, nullptr, input); diff --git a/src/modules/modem/digital/ModemGMSK.h b/src/modules/modem/digital/ModemGMSK.h index 6b82c0d..4268766 100644 --- a/src/modules/modem/digital/ModemGMSK.h +++ b/src/modules/modem/digital/ModemGMSK.h @@ -18,23 +18,23 @@ public: class ModemGMSK : public ModemDigital { public: ModemGMSK(); - ~ModemGMSK(); + ~ModemGMSK() 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; - 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: int _sps; // samples per symbol diff --git a/src/modules/modem/digital/ModemOOK.cpp b/src/modules/modem/digital/ModemOOK.cpp index 2366a42..00e9d4f 100644 --- a/src/modules/modem/digital/ModemOOK.cpp +++ b/src/modules/modem/digital/ModemOOK.cpp @@ -27,7 +27,7 @@ int ModemOOK::checkSampleRate(long long sampleRate, int /* audioSampleRate */) { } void ModemOOK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitDigital *dkit = (ModemKitDigital *)kit; + auto *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodOOK, input); for (size_t i = 0, bufSize=input->data.size(); i < bufSize; i++) { diff --git a/src/modules/modem/digital/ModemOOK.h b/src/modules/modem/digital/ModemOOK.h index 03b5a4b..207084b 100644 --- a/src/modules/modem/digital/ModemOOK.h +++ b/src/modules/modem/digital/ModemOOK.h @@ -7,15 +7,15 @@ class ModemOOK : public ModemDigital { public: ModemOOK(); - ~ModemOOK(); + ~ModemOOK() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - int checkSampleRate(long long sampleRate, int audioSampleRate); + int checkSampleRate(long long sampleRate, int audioSampleRate) override; - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: modem demodOOK; diff --git a/src/modules/modem/digital/ModemPSK.cpp b/src/modules/modem/digital/ModemPSK.cpp index c2e99a1..3bddc32 100644 --- a/src/modules/modem/digital/ModemPSK.cpp +++ b/src/modules/modem/digital/ModemPSK.cpp @@ -74,9 +74,9 @@ std::string ModemPSK::readSetting(std::string setting) { return ""; } -void ModemPSK::updateDemodulatorCons(int cons) { - this->cons = cons; - switch (cons) { +void ModemPSK::updateDemodulatorCons(int cons_in) { + cons = cons_in; + switch (cons_in) { case 2: demodPSK = demodPSK2; break; @@ -105,7 +105,7 @@ void ModemPSK::updateDemodulatorCons(int cons) { } void ModemPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitDigital *dkit = (ModemKitDigital *)kit; + auto *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodPSK, input); diff --git a/src/modules/modem/digital/ModemPSK.h b/src/modules/modem/digital/ModemPSK.h index 5f9880a..4a7cddb 100644 --- a/src/modules/modem/digital/ModemPSK.h +++ b/src/modules/modem/digital/ModemPSK.h @@ -7,18 +7,18 @@ class ModemPSK : public ModemDigital { public: ModemPSK(); - ~ModemPSK(); + ~ModemPSK() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - 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; - void updateDemodulatorCons(int cons); - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void updateDemodulatorCons(int cons_in); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: int cons; diff --git a/src/modules/modem/digital/ModemQAM.cpp b/src/modules/modem/digital/ModemQAM.cpp index e516e70..89cf79a 100644 --- a/src/modules/modem/digital/ModemQAM.cpp +++ b/src/modules/modem/digital/ModemQAM.cpp @@ -70,9 +70,9 @@ std::string ModemQAM::readSetting(std::string setting) { return ""; } -void ModemQAM::updateDemodulatorCons(int cons) { - this->cons = cons; - switch (cons) { +void ModemQAM::updateDemodulatorCons(int cons_in) { + cons = cons_in; + switch (cons_in) { case 4: demodQAM = demodQAM4; break; @@ -98,7 +98,7 @@ void ModemQAM::updateDemodulatorCons(int cons) { } void ModemQAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitDigital *dkit = (ModemKitDigital *)kit; + auto *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodQAM, input); for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) { diff --git a/src/modules/modem/digital/ModemQAM.h b/src/modules/modem/digital/ModemQAM.h index 4260596..07495ba 100644 --- a/src/modules/modem/digital/ModemQAM.h +++ b/src/modules/modem/digital/ModemQAM.h @@ -7,18 +7,18 @@ class ModemQAM : public ModemDigital { public: ModemQAM(); - ~ModemQAM(); + ~ModemQAM() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - 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; - void updateDemodulatorCons(int cons); - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void updateDemodulatorCons(int cons_in); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: int cons; diff --git a/src/modules/modem/digital/ModemQPSK.cpp b/src/modules/modem/digital/ModemQPSK.cpp index c9e805c..3d38191 100644 --- a/src/modules/modem/digital/ModemQPSK.cpp +++ b/src/modules/modem/digital/ModemQPSK.cpp @@ -20,7 +20,7 @@ std::string ModemQPSK::getName() { } void ModemQPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitDigital *dkit = (ModemKitDigital *)kit; + auto *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodQPSK, input); for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) { diff --git a/src/modules/modem/digital/ModemQPSK.h b/src/modules/modem/digital/ModemQPSK.h index c510a54..41aca55 100644 --- a/src/modules/modem/digital/ModemQPSK.h +++ b/src/modules/modem/digital/ModemQPSK.h @@ -7,13 +7,13 @@ class ModemQPSK : public ModemDigital { public: ModemQPSK(); - ~ModemQPSK(); + ~ModemQPSK() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: modem demodQPSK; diff --git a/src/modules/modem/digital/ModemSQAM.cpp b/src/modules/modem/digital/ModemSQAM.cpp index a6f255c..b4cae56 100644 --- a/src/modules/modem/digital/ModemSQAM.cpp +++ b/src/modules/modem/digital/ModemSQAM.cpp @@ -55,9 +55,9 @@ std::string ModemSQAM::readSetting(std::string setting) { return ""; } -void ModemSQAM::updateDemodulatorCons(int cons) { - this->cons = cons; - switch (cons) { +void ModemSQAM::updateDemodulatorCons(int cons_in) { + cons = cons_in; + switch (cons_in) { case 32: demodSQAM = demodSQAM32; break; @@ -68,7 +68,7 @@ void ModemSQAM::updateDemodulatorCons(int cons) { } void ModemSQAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitDigital *dkit = (ModemKitDigital *)kit; + auto *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodSQAM, input); diff --git a/src/modules/modem/digital/ModemSQAM.h b/src/modules/modem/digital/ModemSQAM.h index fcd2b92..3f8a37f 100644 --- a/src/modules/modem/digital/ModemSQAM.h +++ b/src/modules/modem/digital/ModemSQAM.h @@ -7,18 +7,18 @@ class ModemSQAM : public ModemDigital { public: ModemSQAM(); - ~ModemSQAM(); + ~ModemSQAM() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - 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; - void updateDemodulatorCons(int cons); - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void updateDemodulatorCons(int cons_in); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: int cons; diff --git a/src/modules/modem/digital/ModemST.cpp b/src/modules/modem/digital/ModemST.cpp index 2285e86..016b131 100644 --- a/src/modules/modem/digital/ModemST.cpp +++ b/src/modules/modem/digital/ModemST.cpp @@ -20,7 +20,7 @@ ModemST::~ModemST() { } void ModemST::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) { - ModemKitDigital *dkit = (ModemKitDigital *)kit; + auto *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodST, input); for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) { diff --git a/src/modules/modem/digital/ModemST.h b/src/modules/modem/digital/ModemST.h index cf74e69..f943ef1 100644 --- a/src/modules/modem/digital/ModemST.h +++ b/src/modules/modem/digital/ModemST.h @@ -7,13 +7,13 @@ class ModemST : public ModemDigital { public: ModemST(); - ~ModemST(); + ~ModemST() override; - std::string getName(); + std::string getName() override; static ModemBase *factory(); - void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut); + void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override; private: modem demodST;