Fix #926: liquid-dsp master 'modem' changed to 'modemcf' for Digital modems, updates Windows liquid-dsp binaries to master

- Updated Windows bins dependencies to latest MSYS2
- Win32/64 bins liquid-dsp ref: 471f46660ddfab7e6713341324f473b7785da101
- Win32/64 bins using GCC 11.2 (MSYS2)

src/modules/modem/ModemDigital.cpp

@@ -48,11 +48,11 @@ int ModemDigital::getDemodulatorLock() {
     return currentDemodLock.load();
 }
 
-void ModemDigital::updateDemodulatorLock(modem mod, float sensitivity) {
-    setDemodulatorLock(modem_get_demodulator_evm(mod) <= sensitivity);
+void ModemDigital::updateDemodulatorLock(modemcf mod, float sensitivity) {
+    setDemodulatorLock(modemcf_get_demodulator_evm(mod) <= sensitivity);
 }
 
-void ModemDigital::digitalStart(ModemKitDigital * /* kit */, modem /* mod */, ModemIQData *input) {
+void ModemDigital::digitalStart(ModemKitDigital * /* kit */, modemcf /* mod */, ModemIQData *input) {
     size_t bufSize = input->data.size();
     
     if (demodOutputDataDigital.size() != bufSize) {
@@ -63,7 +63,7 @@ void ModemDigital::digitalStart(ModemKitDigital * /* kit */, modem /* mod */, Mo
     }
 }
 
-void ModemDigital::digitalFinish(ModemKitDigital * /* kit */, modem /* mod */) {
+void ModemDigital::digitalFinish(ModemKitDigital * /* kit */, modemcf /* mod */) {
 #if ENABLE_DIGITAL_LAB
     if (digitalOut && outStream.str().length()) {
         digitalOut->write(outStream.str());

src/modules/modem/ModemDigital.h

@@ -42,13 +42,13 @@ public:
     ModemKit *buildKit(long long sampleRate, int audioSampleRate) override;
     void disposeKit(ModemKit *kit) override;
     
-    virtual void digitalStart(ModemKitDigital *kit, modem mod, ModemIQData *input);
-    virtual void digitalFinish(ModemKitDigital *kit, modem mod);
+    virtual void digitalStart(ModemKitDigital *kit, modemcf mod, ModemIQData *input);
+    virtual void digitalFinish(ModemKitDigital *kit, modemcf mod);
 
     virtual void setDemodulatorLock(bool demod_lock_in);
     virtual int getDemodulatorLock();
     
-    virtual void updateDemodulatorLock(modem mod, float sensitivity);
+    virtual void updateDemodulatorLock(modemcf mod, float sensitivity);
 
 #if ENABLE_DIGITAL_LAB
     void setOutput(ModemDigitalOutput *digitalOutput);

src/modules/modem/digital/ModemAPSK.cpp

@@ -4,13 +4,13 @@
 #include "ModemAPSK.h"
 
 ModemAPSK::ModemAPSK() : ModemDigital() {
-    demodAPSK4 = modem_create(LIQUID_MODEM_APSK4);
-    demodAPSK8 = modem_create(LIQUID_MODEM_APSK8);
-    demodAPSK16 = modem_create(LIQUID_MODEM_APSK16);
-    demodAPSK32 = modem_create(LIQUID_MODEM_APSK32);
-    demodAPSK64 = modem_create(LIQUID_MODEM_APSK64);
-    demodAPSK128 = modem_create(LIQUID_MODEM_APSK128);
-    demodAPSK256 = modem_create(LIQUID_MODEM_APSK256);
+    demodAPSK4 = modemcf_create(LIQUID_MODEM_APSK4);
+    demodAPSK8 = modemcf_create(LIQUID_MODEM_APSK8);
+    demodAPSK16 = modemcf_create(LIQUID_MODEM_APSK16);
+    demodAPSK32 = modemcf_create(LIQUID_MODEM_APSK32);
+    demodAPSK64 = modemcf_create(LIQUID_MODEM_APSK64);
+    demodAPSK128 = modemcf_create(LIQUID_MODEM_APSK128);
+    demodAPSK256 = modemcf_create(LIQUID_MODEM_APSK256);
     demodAPSK = demodAPSK4;
     cons = 4;
 }
@@ -20,13 +20,13 @@ ModemBase *ModemAPSK::factory() {
 }
 
 ModemAPSK::~ModemAPSK() {
-    modem_destroy(demodAPSK4);
-    modem_destroy(demodAPSK8);
-    modem_destroy(demodAPSK16);
-    modem_destroy(demodAPSK32);
-    modem_destroy(demodAPSK64);
-    modem_destroy(demodAPSK128);
-    modem_destroy(demodAPSK256);
+    modemcf_destroy(demodAPSK4);
+    modemcf_destroy(demodAPSK8);
+    modemcf_destroy(demodAPSK16);
+    modemcf_destroy(demodAPSK32);
+    modemcf_destroy(demodAPSK64);
+    modemcf_destroy(demodAPSK128);
+    modemcf_destroy(demodAPSK256);
 }
 
 std::string ModemAPSK::getName() {
@@ -103,7 +103,7 @@ void ModemAPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *
     digitalStart(dkit, demodAPSK, input);
     
     for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) {
-        modem_demodulate(demodAPSK, input->data[i], &demodOutputDataDigital[i]);
+        modemcf_demodulate(demodAPSK, input->data[i], &demodOutputDataDigital[i]);
     }
     
     updateDemodulatorLock(demodAPSK, 0.005f);

src/modules/modem/digital/ModemAPSK.h

@@ -22,12 +22,12 @@ public:
     
 private:
     int cons;
-    modem demodAPSK;
-    modem demodAPSK4;
-    modem demodAPSK8;
-    modem demodAPSK16;
-    modem demodAPSK32;
-    modem demodAPSK64;
-    modem demodAPSK128;
-    modem demodAPSK256;
+    modemcf demodAPSK;
+    modemcf demodAPSK4;
+    modemcf demodAPSK8;
+    modemcf demodAPSK16;
+    modemcf demodAPSK32;
+    modemcf demodAPSK64;
+    modemcf demodAPSK128;
+    modemcf demodAPSK256;
 };

src/modules/modem/digital/ModemASK.cpp

@@ -4,14 +4,14 @@
 #include "ModemASK.h"
 
 ModemASK::ModemASK() : ModemDigital()  {
-    demodASK2 = modem_create(LIQUID_MODEM_ASK2);
-    demodASK4 = modem_create(LIQUID_MODEM_ASK4);
-    demodASK8 = modem_create(LIQUID_MODEM_ASK8);
-    demodASK16 = modem_create(LIQUID_MODEM_ASK16);
-    demodASK32 = modem_create(LIQUID_MODEM_ASK32);
-    demodASK64 = modem_create(LIQUID_MODEM_ASK64);
-    demodASK128 = modem_create(LIQUID_MODEM_ASK128);
-    demodASK256 = modem_create(LIQUID_MODEM_ASK256);
+    demodASK2 = modemcf_create(LIQUID_MODEM_ASK2);
+    demodASK4 = modemcf_create(LIQUID_MODEM_ASK4);
+    demodASK8 = modemcf_create(LIQUID_MODEM_ASK8);
+    demodASK16 = modemcf_create(LIQUID_MODEM_ASK16);
+    demodASK32 = modemcf_create(LIQUID_MODEM_ASK32);
+    demodASK64 = modemcf_create(LIQUID_MODEM_ASK64);
+    demodASK128 = modemcf_create(LIQUID_MODEM_ASK128);
+    demodASK256 = modemcf_create(LIQUID_MODEM_ASK256);
     demodASK = demodASK2;
     cons = 2;
 }
@@ -21,13 +21,13 @@ ModemBase *ModemASK::factory() {
 }
 
 ModemASK::~ModemASK() {
-    modem_destroy(demodASK4);
-    modem_destroy(demodASK8);
-    modem_destroy(demodASK16);
-    modem_destroy(demodASK32);
-    modem_destroy(demodASK64);
-    modem_destroy(demodASK128);
-    modem_destroy(demodASK256);
+    modemcf_destroy(demodASK4);
+    modemcf_destroy(demodASK8);
+    modemcf_destroy(demodASK16);
+    modemcf_destroy(demodASK32);
+    modemcf_destroy(demodASK64);
+    modemcf_destroy(demodASK128);
+    modemcf_destroy(demodASK256);
 }
 
 std::string ModemASK::getName() {
@@ -108,7 +108,7 @@ void ModemASK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *
     digitalStart(dkit, demodASK, input);
 
     for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) {
-        modem_demodulate(demodASK, input->data[i], &demodOutputDataDigital[i]);
+        modemcf_demodulate(demodASK, input->data[i], &demodOutputDataDigital[i]);
     }
     updateDemodulatorLock(demodASK, 0.005f);
     

src/modules/modem/digital/ModemASK.h

@@ -22,13 +22,13 @@ public:
     
 private:
     int cons;
-    modem demodASK;
-    modem demodASK2;
-    modem demodASK4;
-    modem demodASK8;
-    modem demodASK16;
-    modem demodASK32;
-    modem demodASK64;
-    modem demodASK128;
-    modem demodASK256;
+    modemcf demodASK;
+    modemcf demodASK2;
+    modemcf demodASK4;
+    modemcf demodASK8;
+    modemcf demodASK16;
+    modemcf demodASK32;
+    modemcf demodASK64;
+    modemcf demodASK128;
+    modemcf demodASK256;
 };

src/modules/modem/digital/ModemBPSK.cpp

@@ -4,7 +4,7 @@
 #include "ModemBPSK.h"
 
 ModemBPSK::ModemBPSK() : ModemDigital()  {
-    demodBPSK = modem_create(LIQUID_MODEM_BPSK);
+    demodBPSK = modemcf_create(LIQUID_MODEM_BPSK);
 }
 
 ModemBase *ModemBPSK::factory() {
@@ -12,7 +12,7 @@ ModemBase *ModemBPSK::factory() {
 }
 
 ModemBPSK::~ModemBPSK() {
-    modem_destroy(demodBPSK);
+    modemcf_destroy(demodBPSK);
 }
 
 std::string ModemBPSK::getName() {
@@ -24,7 +24,7 @@ void ModemBPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *
     digitalStart(dkit, demodBPSK, input);
 
     for (size_t i = 0, bufSize=input->data.size(); i < bufSize; i++) {
-        modem_demodulate(demodBPSK, input->data[i], &demodOutputDataDigital[i]);
+        modemcf_demodulate(demodBPSK, input->data[i], &demodOutputDataDigital[i]);
     }
     updateDemodulatorLock(demodBPSK, 0.005f);
     

src/modules/modem/digital/ModemBPSK.h

@@ -16,5 +16,5 @@ public:
     void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
     
 private:
-    modem demodBPSK;
+    modemcf demodBPSK;
 };

src/modules/modem/digital/ModemDPSK.cpp

@@ -4,14 +4,14 @@
 #include "ModemDPSK.h"
 
 ModemDPSK::ModemDPSK() : ModemDigital() {
-    demodDPSK2 = modem_create(LIQUID_MODEM_DPSK2);
-    demodDPSK4 = modem_create(LIQUID_MODEM_DPSK4);
-    demodDPSK8 = modem_create(LIQUID_MODEM_DPSK8);
-    demodDPSK16 = modem_create(LIQUID_MODEM_DPSK16);
-    demodDPSK32 = modem_create(LIQUID_MODEM_DPSK32);
-    demodDPSK64 = modem_create(LIQUID_MODEM_DPSK64);
-    demodDPSK128 = modem_create(LIQUID_MODEM_DPSK128);
-    demodDPSK256 = modem_create(LIQUID_MODEM_DPSK256);
+    demodDPSK2 = modemcf_create(LIQUID_MODEM_DPSK2);
+    demodDPSK4 = modemcf_create(LIQUID_MODEM_DPSK4);
+    demodDPSK8 = modemcf_create(LIQUID_MODEM_DPSK8);
+    demodDPSK16 = modemcf_create(LIQUID_MODEM_DPSK16);
+    demodDPSK32 = modemcf_create(LIQUID_MODEM_DPSK32);
+    demodDPSK64 = modemcf_create(LIQUID_MODEM_DPSK64);
+    demodDPSK128 = modemcf_create(LIQUID_MODEM_DPSK128);
+    demodDPSK256 = modemcf_create(LIQUID_MODEM_DPSK256);
     demodDPSK = demodDPSK2;
     cons = 2;
 }
@@ -25,14 +25,14 @@ std::string ModemDPSK::getName() {
 }
 
 ModemDPSK::~ModemDPSK() {
-    modem_destroy(demodDPSK2);
-    modem_destroy(demodDPSK4);
-    modem_destroy(demodDPSK8);
-    modem_destroy(demodDPSK16);
-    modem_destroy(demodDPSK32);
-    modem_destroy(demodDPSK64);
-    modem_destroy(demodDPSK128);
-    modem_destroy(demodDPSK256);
+    modemcf_destroy(demodDPSK2);
+    modemcf_destroy(demodDPSK4);
+    modemcf_destroy(demodDPSK8);
+    modemcf_destroy(demodDPSK16);
+    modemcf_destroy(demodDPSK32);
+    modemcf_destroy(demodDPSK64);
+    modemcf_destroy(demodDPSK128);
+    modemcf_destroy(demodDPSK256);
 }
 
 ModemArgInfoList ModemDPSK::getSettings() {
@@ -109,7 +109,7 @@ void ModemDPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *
     digitalStart(dkit, demodDPSK, input);
  
     for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) {
-        modem_demodulate(demodDPSK, input->data[i], &demodOutputDataDigital[i]);
+        modemcf_demodulate(demodDPSK, input->data[i], &demodOutputDataDigital[i]);
     }
     updateDemodulatorLock(demodDPSK, 0.005f);
     

src/modules/modem/digital/ModemDPSK.h

@@ -22,14 +22,14 @@ public:
     
 private:
     int cons;
-    modem demodDPSK;
-    modem demodDPSK2;
-    modem demodDPSK4;
-    modem demodDPSK8;
-    modem demodDPSK16;
-    modem demodDPSK32;
-    modem demodDPSK64;
-    modem demodDPSK128;
-    modem demodDPSK256;
+    modemcf demodDPSK;
+    modemcf demodDPSK2;
+    modemcf demodDPSK4;
+    modemcf demodDPSK8;
+    modemcf demodDPSK16;
+    modemcf demodDPSK32;
+    modemcf demodDPSK64;
+    modemcf demodDPSK128;
+    modemcf demodDPSK256;
 };
 

src/modules/modem/digital/ModemOOK.cpp

@@ -4,11 +4,11 @@
 #include "ModemOOK.h"
 
 ModemOOK::ModemOOK() : ModemDigital()  {
-    demodOOK = modem_create(LIQUID_MODEM_OOK);
+    demodOOK = modemcf_create(LIQUID_MODEM_OOK);
 }
 
 ModemOOK::~ModemOOK() {
-    modem_destroy(demodOOK);
+    modemcf_destroy(demodOOK);
 }
 
 std::string ModemOOK::getName() {
@@ -31,7 +31,7 @@ void ModemOOK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *
     digitalStart(dkit, demodOOK, input);
    
     for (size_t i = 0, bufSize=input->data.size(); i < bufSize; i++) {
-        modem_demodulate(demodOOK, input->data[i], &demodOutputDataDigital[i]);
+        modemcf_demodulate(demodOOK, input->data[i], &demodOutputDataDigital[i]);
     }
     updateDemodulatorLock(demodOOK, 0.005f);
     

src/modules/modem/digital/ModemOOK.h

@@ -18,5 +18,5 @@ public:
     void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
     
 private:
-    modem demodOOK;
+    modemcf demodOOK;
 };

src/modules/modem/digital/ModemPSK.cpp

@@ -4,14 +4,14 @@
 #include "ModemPSK.h"
 
 ModemPSK::ModemPSK() : ModemDigital()  {
-    demodPSK2 = modem_create(LIQUID_MODEM_PSK2);
-    demodPSK4 = modem_create(LIQUID_MODEM_PSK4);
-    demodPSK8 = modem_create(LIQUID_MODEM_PSK8);
-    demodPSK16 = modem_create(LIQUID_MODEM_PSK16);
-    demodPSK32 = modem_create(LIQUID_MODEM_PSK32);
-    demodPSK64 = modem_create(LIQUID_MODEM_PSK64);
-    demodPSK128 = modem_create(LIQUID_MODEM_PSK128);
-    demodPSK256 = modem_create(LIQUID_MODEM_PSK256);
+    demodPSK2 = modemcf_create(LIQUID_MODEM_PSK2);
+    demodPSK4 = modemcf_create(LIQUID_MODEM_PSK4);
+    demodPSK8 = modemcf_create(LIQUID_MODEM_PSK8);
+    demodPSK16 = modemcf_create(LIQUID_MODEM_PSK16);
+    demodPSK32 = modemcf_create(LIQUID_MODEM_PSK32);
+    demodPSK64 = modemcf_create(LIQUID_MODEM_PSK64);
+    demodPSK128 = modemcf_create(LIQUID_MODEM_PSK128);
+    demodPSK256 = modemcf_create(LIQUID_MODEM_PSK256);
     demodPSK = demodPSK2;
     cons = 2;
 }
@@ -25,14 +25,14 @@ std::string ModemPSK::getName() {
 }
 
 ModemPSK::~ModemPSK() {
-    modem_destroy(demodPSK2);
-    modem_destroy(demodPSK4);
-    modem_destroy(demodPSK8);
-    modem_destroy(demodPSK16);
-    modem_destroy(demodPSK32);
-    modem_destroy(demodPSK64);
-    modem_destroy(demodPSK128);
-    modem_destroy(demodPSK256);
+    modemcf_destroy(demodPSK2);
+    modemcf_destroy(demodPSK4);
+    modemcf_destroy(demodPSK8);
+    modemcf_destroy(demodPSK16);
+    modemcf_destroy(demodPSK32);
+    modemcf_destroy(demodPSK64);
+    modemcf_destroy(demodPSK128);
+    modemcf_destroy(demodPSK256);
 }
 
 
@@ -110,7 +110,7 @@ void ModemPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *
     digitalStart(dkit, demodPSK, input);
     
     for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) {
-        modem_demodulate(demodPSK, input->data[i], &demodOutputDataDigital[i]);
+        modemcf_demodulate(demodPSK, input->data[i], &demodOutputDataDigital[i]);
     }
     updateDemodulatorLock(demodPSK, 0.005f);
     

src/modules/modem/digital/ModemPSK.h

@@ -22,14 +22,14 @@ public:
     
 private:
     int cons;
-    modem demodPSK;
-    modem demodPSK2;
-    modem demodPSK4;
-    modem demodPSK8;
-    modem demodPSK16;
-    modem demodPSK32;
-    modem demodPSK64;
-    modem demodPSK128;
-    modem demodPSK256;
+    modemcf demodPSK;
+    modemcf demodPSK2;
+    modemcf demodPSK4;
+    modemcf demodPSK8;
+    modemcf demodPSK16;
+    modemcf demodPSK32;
+    modemcf demodPSK64;
+    modemcf demodPSK128;
+    modemcf demodPSK256;
 };
 

src/modules/modem/digital/ModemQAM.cpp

@@ -4,13 +4,13 @@
 #include "ModemQAM.h"
 
 ModemQAM::ModemQAM() : ModemDigital()  {
-    demodQAM4 = modem_create(LIQUID_MODEM_QAM4);
-    demodQAM8 = modem_create(LIQUID_MODEM_QAM8);
-    demodQAM16 = modem_create(LIQUID_MODEM_QAM16);
-    demodQAM32 = modem_create(LIQUID_MODEM_QAM32);
-    demodQAM64 = modem_create(LIQUID_MODEM_QAM64);
-    demodQAM128 = modem_create(LIQUID_MODEM_QAM128);
-    demodQAM256 = modem_create(LIQUID_MODEM_QAM256);
+    demodQAM4 = modemcf_create(LIQUID_MODEM_QAM4);
+    demodQAM8 = modemcf_create(LIQUID_MODEM_QAM8);
+    demodQAM16 = modemcf_create(LIQUID_MODEM_QAM16);
+    demodQAM32 = modemcf_create(LIQUID_MODEM_QAM32);
+    demodQAM64 = modemcf_create(LIQUID_MODEM_QAM64);
+    demodQAM128 = modemcf_create(LIQUID_MODEM_QAM128);
+    demodQAM256 = modemcf_create(LIQUID_MODEM_QAM256);
     demodQAM = demodQAM4;
     cons = 4;
 }
@@ -24,13 +24,13 @@ std::string ModemQAM::getName() {
 }
 
 ModemQAM::~ModemQAM() {
-    modem_destroy(demodQAM4);
-    modem_destroy(demodQAM8);
-    modem_destroy(demodQAM16);
-    modem_destroy(demodQAM32);
-    modem_destroy(demodQAM64);
-    modem_destroy(demodQAM128);
-    modem_destroy(demodQAM256);
+    modemcf_destroy(demodQAM4);
+    modemcf_destroy(demodQAM8);
+    modemcf_destroy(demodQAM16);
+    modemcf_destroy(demodQAM32);
+    modemcf_destroy(demodQAM64);
+    modemcf_destroy(demodQAM128);
+    modemcf_destroy(demodQAM256);
 }
 
 ModemArgInfoList ModemQAM::getSettings() {
@@ -102,7 +102,7 @@ void ModemQAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *
     digitalStart(dkit, demodQAM, input);
    
     for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) {
-        modem_demodulate(demodQAM, input->data[i], &demodOutputDataDigital[i]);
+        modemcf_demodulate(demodQAM, input->data[i], &demodOutputDataDigital[i]);
     }
     updateDemodulatorLock(demodQAM, 0.5f);
     

src/modules/modem/digital/ModemQAM.h

@@ -22,14 +22,14 @@ public:
     
 private:
     int cons;
-    modem demodQAM;
-    modem demodQAM4;
-    modem demodQAM8;
-    modem demodQAM16;
-    modem demodQAM32;
-    modem demodQAM64;
-    modem demodQAM128;
-    modem demodQAM256;
+    modemcf demodQAM;
+    modemcf demodQAM4;
+    modemcf demodQAM8;
+    modemcf demodQAM16;
+    modemcf demodQAM32;
+    modemcf demodQAM64;
+    modemcf demodQAM128;
+    modemcf demodQAM256;
 };
 
 

src/modules/modem/digital/ModemQPSK.cpp

@@ -4,7 +4,7 @@
 #include "ModemQPSK.h"
 
 ModemQPSK::ModemQPSK() : ModemDigital()  {
-    demodQPSK = modem_create(LIQUID_MODEM_QPSK);
+    demodQPSK = modemcf_create(LIQUID_MODEM_QPSK);
 }
 
 ModemBase *ModemQPSK::factory() {
@@ -12,7 +12,7 @@ ModemBase *ModemQPSK::factory() {
 }
 
 ModemQPSK::~ModemQPSK() {
-    modem_destroy(demodQPSK);
+    modemcf_destroy(demodQPSK);
 }
 
 std::string ModemQPSK::getName() {
@@ -24,7 +24,7 @@ void ModemQPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *
     digitalStart(dkit, demodQPSK, input);
 
     for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) {
-        modem_demodulate(demodQPSK, input->data[i], &demodOutputDataDigital[i]);
+        modemcf_demodulate(demodQPSK, input->data[i], &demodOutputDataDigital[i]);
     }
     updateDemodulatorLock(demodQPSK, 0.8f);
     

src/modules/modem/digital/ModemQPSK.h

@@ -16,5 +16,5 @@ public:
     void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
     
 private:
-    modem demodQPSK;
+    modemcf demodQPSK;
 };

src/modules/modem/digital/ModemSQAM.cpp

@@ -4,8 +4,8 @@
 #include "ModemSQAM.h"
 
 ModemSQAM::ModemSQAM() : ModemDigital()  {
-    demodSQAM32 = modem_create(LIQUID_MODEM_SQAM32);
-    demodSQAM128 = modem_create(LIQUID_MODEM_SQAM128);
+    demodSQAM32 = modemcf_create(LIQUID_MODEM_SQAM32);
+    demodSQAM128 = modemcf_create(LIQUID_MODEM_SQAM128);
     demodSQAM = demodSQAM32;
     cons = 32;
 }
@@ -15,8 +15,8 @@ ModemBase *ModemSQAM::factory() {
 }
 
 ModemSQAM::~ModemSQAM() {
-    modem_destroy(demodSQAM32);
-    modem_destroy(demodSQAM128);
+    modemcf_destroy(demodSQAM32);
+    modemcf_destroy(demodSQAM128);
 }
 
 std::string ModemSQAM::getName() {
@@ -73,7 +73,7 @@ void ModemSQAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *
     digitalStart(dkit, demodSQAM, input);
     
     for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) {
-        modem_demodulate(demodSQAM, input->data[i], &demodOutputDataDigital[i]);
+        modemcf_demodulate(demodSQAM, input->data[i], &demodOutputDataDigital[i]);
     }
     updateDemodulatorLock(demodSQAM, 0.005f);
     

src/modules/modem/digital/ModemSQAM.h

@@ -22,7 +22,7 @@ public:
     
 private:
     int cons;
-    modem demodSQAM;
-    modem demodSQAM32;
-    modem demodSQAM128;
+    modemcf demodSQAM;
+    modemcf demodSQAM32;
+    modemcf demodSQAM128;
 };

src/modules/modem/digital/ModemST.cpp

@@ -4,7 +4,7 @@
 #include "ModemST.h"
 
 ModemST::ModemST() : ModemDigital()  {
-    demodST = modem_create(LIQUID_MODEM_V29);
+    demodST = modemcf_create(LIQUID_MODEM_V29);
 }
 
 ModemBase *ModemST::factory() {
@@ -16,7 +16,7 @@ std::string ModemST::getName() {
 }
 
 ModemST::~ModemST() {
-    modem_destroy(demodST);
+    modemcf_destroy(demodST);
 }
 
 void ModemST::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /* audioOut */) {
@@ -24,7 +24,7 @@ void ModemST::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * /
     digitalStart(dkit, demodST, input);
 
     for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) {
-        modem_demodulate(demodST, input->data[i], &demodOutputDataDigital[i]);
+        modemcf_demodulate(demodST, input->data[i], &demodOutputDataDigital[i]);
     }
     updateDemodulatorLock(demodST, 0.005f);
     

src/modules/modem/digital/ModemST.h

@@ -16,6 +16,6 @@ public:
     void demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) override;
     
 private:
-    modem demodST;
+    modemcf demodST;
 };