MSVC fixes

This commit is contained in:
Charles J. Cliffe 2015-11-20 19:05:08 -05:00
parent cf5cefbf6c
commit c912601272
3 changed files with 8 additions and 4 deletions

View File

@ -2,8 +2,8 @@ cmake_minimum_required (VERSION 2.8)
SET(CUBICSDR_VERSION_MAJOR "0") SET(CUBICSDR_VERSION_MAJOR "0")
SET(CUBICSDR_VERSION_MINOR "1") SET(CUBICSDR_VERSION_MINOR "1")
SET(CUBICSDR_VERSION_PATCH "16") SET(CUBICSDR_VERSION_PATCH "17")
SET(CUBICSDR_VERSION_REL "alpha") SET(CUBICSDR_VERSION_REL "alpha-demod-refactor")
SET(CUBICSDR_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}-${CUBICSDR_VERSION_REL}") 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}") SET(CPACK_PACKAGE_VERSION "${CUBICSDR_VERSION_MAJOR}.${CUBICSDR_VERSION_MINOR}.${CUBICSDR_VERSION_PATCH}")

View File

@ -22,7 +22,9 @@ void ModemAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *au
return; 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); buildAudioOutput(amkit,audioOut,true);
} }

View File

@ -22,7 +22,9 @@ void ModemDSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a
return; 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); buildAudioOutput(amkit, audioOut, true);
} }