modem init order fix

This commit is contained in:
Charles J. Cliffe 2015-11-18 21:33:52 -05:00
parent d6ffb6edc2
commit 94f94fa7dc
3 changed files with 2 additions and 4 deletions

View File

@ -1,8 +1,6 @@
#include "ModemPSK.h"
ModemPSK::ModemPSK() {
demodPSK = demodPSK2;
demodPSK2 = modem_create(LIQUID_MODEM_PSK2);
demodPSK4 = modem_create(LIQUID_MODEM_PSK4);
demodPSK8 = modem_create(LIQUID_MODEM_PSK8);
@ -11,6 +9,7 @@ ModemPSK::ModemPSK() {
demodPSK64 = modem_create(LIQUID_MODEM_PSK64);
demodPSK128 = modem_create(LIQUID_MODEM_PSK128);
demodPSK256 = modem_create(LIQUID_MODEM_PSK256);
demodPSK = demodPSK2;
}
Modem *ModemPSK::factory() {

View File

@ -1,9 +1,9 @@
#include "ModemSQAM.h"
ModemSQAM::ModemSQAM() {
demodSQAM = demodSQAM32;
demodSQAM32 = modem_create(LIQUID_MODEM_SQAM32);
demodSQAM128 = modem_create(LIQUID_MODEM_SQAM128);
demodSQAM = demodSQAM32;
}
Modem *ModemSQAM::factory() {

View File

@ -8,7 +8,6 @@ Modem *ModemST::factory() {
return new ModemST;
}
ModemST::~ModemST() {
modem_destroy(demodST);
}