From c9126012727c4ee3fc5c49b07da87e7f127faf6f Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Fri, 20 Nov 2015 19:05:08 -0500 Subject: [PATCH] MSVC fixes --- CMakeLists.txt | 4 ++-- src/modules/modem/analog/ModemAM.cpp | 4 +++- src/modules/modem/analog/ModemDSB.cpp | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 45b62ee..a09cb5c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required (VERSION 2.8) SET(CUBICSDR_VERSION_MAJOR "0") SET(CUBICSDR_VERSION_MINOR "1") -SET(CUBICSDR_VERSION_PATCH "16") -SET(CUBICSDR_VERSION_REL "alpha") +SET(CUBICSDR_VERSION_PATCH "17") +SET(CUBICSDR_VERSION_REL "alpha-demod-refactor") SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}-${CUBICSDR_VERSION_REL}") SET(CPACK_PACKAGE_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}") diff --git a/src/modules/modem/analog/ModemAM.cpp b/src/modules/modem/analog/ModemAM.cpp index 75c0be0..678832e 100644 --- a/src/modules/modem/analog/ModemAM.cpp +++ b/src/modules/modem/analog/ModemAM.cpp @@ -22,7 +22,9 @@ void ModemAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *au return; } - ampmodem_demodulate_block(demodAM, &input->data[0], bufSize, &demodOutputData[0]); + for (int i = 0; i < bufSize; i++) { + ampmodem_demodulate(demodAM, input->data[i], &demodOutputData[i]); + } buildAudioOutput(amkit,audioOut,true); } diff --git a/src/modules/modem/analog/ModemDSB.cpp b/src/modules/modem/analog/ModemDSB.cpp index 042593a..c343425 100644 --- a/src/modules/modem/analog/ModemDSB.cpp +++ b/src/modules/modem/analog/ModemDSB.cpp @@ -22,7 +22,9 @@ void ModemDSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a return; } - ampmodem_demodulate_block(demodAM_DSB, &input->data[0], bufSize, &demodOutputData[0]); + for (int i = 0; i < bufSize; i++) { + ampmodem_demodulate(demodAM_DSB, input->data[i], &demodOutputData[i]); + } buildAudioOutput(amkit, audioOut, true); }