From 65005b60accae15cc638dc61baf6cc72a32de64b Mon Sep 17 00:00:00 2001 From: "Charles J. Cliffe" Date: Thu, 4 Feb 2016 18:05:33 -0500 Subject: [PATCH] Linux - missing header and warning fixes --- src/AppFrame.cpp | 4 ++-- src/CubicSDR.cpp | 8 ++++---- src/demod/DemodulatorThread.cpp | 2 +- src/modules/modem/ModemAnalog.cpp | 8 ++++---- src/modules/modem/ModemAnalog.h | 4 ++-- src/modules/modem/ModemDigital.cpp | 2 +- src/modules/modem/analog/ModemAM.cpp | 2 +- src/modules/modem/analog/ModemDSB.cpp | 2 +- src/modules/modem/analog/ModemFMStereo.cpp | 8 ++++---- src/modules/modem/analog/ModemIQ.cpp | 4 ++-- src/modules/modem/analog/ModemLSB.cpp | 2 +- src/modules/modem/analog/ModemUSB.cpp | 2 +- src/modules/modem/digital/ModemAPSK.cpp | 2 +- src/modules/modem/digital/ModemASK.cpp | 4 ++-- src/modules/modem/digital/ModemBPSK.cpp | 4 ++-- src/modules/modem/digital/ModemDPSK.cpp | 4 ++-- src/modules/modem/digital/ModemGMSK.cpp | 4 ++-- src/modules/modem/digital/ModemOOK.cpp | 4 ++-- src/modules/modem/digital/ModemPSK.cpp | 4 ++-- src/modules/modem/digital/ModemQAM.cpp | 2 +- src/modules/modem/digital/ModemQPSK.cpp | 4 ++-- src/modules/modem/digital/ModemSQAM.cpp | 4 ++-- src/modules/modem/digital/ModemST.cpp | 4 ++-- src/process/FFTDataDistributor.cpp | 8 ++++---- src/process/FFTDataDistributor.h | 12 ++++++------ src/sdr/SDRDeviceInfo.cpp | 1 + src/sdr/SDRDeviceInfo.h | 1 + src/util/GLFont.cpp | 4 ++-- src/util/Gradient.cpp | 4 ++-- 29 files changed, 60 insertions(+), 58 deletions(-) diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp index e662125..cdc68ea 100644 --- a/src/AppFrame.cpp +++ b/src/AppFrame.cpp @@ -397,7 +397,7 @@ AppFrame::AppFrame() : srateName << ((float) (*srate) / 1000.0f) << "kHz"; wxMenuItem *itm = subMenu->AppendRadioItem(menu_id + j, srateName.str(), wxT("Description?")); - if ((*srate) == AudioThread::deviceSampleRate[mdevices_i->first]) { + if ((int)(*srate) == AudioThread::deviceSampleRate[mdevices_i->first]) { itm->Check(true); } audioSampleRateMenuItems[menu_id + j] = itm; @@ -1024,7 +1024,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) { long long diff = abs(demod->getFrequency() - spectrumCanvas->getCenterFrequency()) + (demod->getBandwidth()/2) + (demod->getBandwidth()/4); if (diff > spectrumCanvas->getBandwidth()/2) { - if (demod->getBandwidth() > spectrumCanvas->getBandwidth()) { + if (demod->getBandwidth() > (int)spectrumCanvas->getBandwidth()) { diff = abs(demod->getFrequency() - spectrumCanvas->getCenterFrequency()); } else { diff = diff - spectrumCanvas->getBandwidth()/2; diff --git a/src/CubicSDR.cpp b/src/CubicSDR.cpp index e804af3..d023ad1 100644 --- a/src/CubicSDR.cpp +++ b/src/CubicSDR.cpp @@ -529,12 +529,12 @@ void CubicSDR::setDevice(SDRDeviceInfo *dev) { SoapySDR::Device *soapyDev = dev->getSoapyDevice(); if (soapyDev) { - long long freqHigh, freqLow; + //long long freqHigh, freqLow; - SoapySDR::RangeList freqRange = soapyDev->getFrequencyRange(SOAPY_SDR_RX, 0); + //SoapySDR::RangeList freqRange = soapyDev->getFrequencyRange(SOAPY_SDR_RX, 0); - freqLow = freqRange[0].minimum(); - freqHigh = freqRange[freqRange.size()-1].maximum(); + //freqLow = freqRange[0].minimum(); + //freqHigh = freqRange[freqRange.size()-1].maximum(); // Try for a reasonable default sample rate. if (!sampleRateInitialized.load()) { diff --git a/src/demod/DemodulatorThread.cpp b/src/demod/DemodulatorThread.cpp index 8c50aa4..e166e2a 100644 --- a/src/demod/DemodulatorThread.cpp +++ b/src/demod/DemodulatorThread.cpp @@ -73,7 +73,7 @@ void DemodulatorThread::run() { iqInputQueue->pop(inp); // std::lock_guard < std::mutex > lock(inp->m_mutex); - int bufSize = inp->data.size(); + size_t bufSize = inp->data.size(); if (!bufSize) { inp->decRefCount(); diff --git a/src/modules/modem/ModemAnalog.cpp b/src/modules/modem/ModemAnalog.cpp index fc98ad8..df6b990 100644 --- a/src/modules/modem/ModemAnalog.cpp +++ b/src/modules/modem/ModemAnalog.cpp @@ -8,7 +8,7 @@ std::string ModemAnalog::getType() { return "analog"; } -int ModemAnalog::checkSampleRate(long long sampleRate, int audioSampleRate) { +int ModemAnalog::checkSampleRate(long long sampleRate, int /* audioSampleRate */) { if (sampleRate < MIN_BANDWIDTH) { return MIN_BANDWIDTH; } @@ -45,7 +45,7 @@ void ModemAnalog::initOutputBuffers(ModemKitAnalog *akit, ModemIQData *input) { double audio_resample_ratio = akit->audioResampleRatio; - int audio_out_size = ceil((double) (bufSize) * audio_resample_ratio) + 512; + size_t audio_out_size = ceil((double) (bufSize) * audio_resample_ratio) + 512; if (demodOutputData.size() != bufSize) { if (demodOutputData.capacity() < bufSize) { @@ -69,7 +69,7 @@ void ModemAnalog::buildAudioOutput(ModemKitAnalog *akit, AudioThreadInput *audio aOutputCeilMAA = aOutputCeilMAA + (aOutputCeilMA - aOutputCeilMAA) * 0.025; aOutputCeil = 0; - for (int i = 0; i < bufSize; i++) { + for (size_t i = 0; i < bufSize; i++) { if (demodOutputData[i] > aOutputCeil) { aOutputCeil = demodOutputData[i]; } @@ -77,7 +77,7 @@ void ModemAnalog::buildAudioOutput(ModemKitAnalog *akit, AudioThreadInput *audio float gain = 0.5 / aOutputCeilMAA; - for (int i = 0; i < bufSize; i++) { + for (size_t i = 0; i < bufSize; i++) { demodOutputData[i] *= gain; } } diff --git a/src/modules/modem/ModemAnalog.h b/src/modules/modem/ModemAnalog.h index dbf07b9..be19159 100644 --- a/src/modules/modem/ModemAnalog.h +++ b/src/modules/modem/ModemAnalog.h @@ -24,11 +24,11 @@ public: virtual std::vector *getDemodOutputData(); virtual std::vector *getResampledOutputData(); protected: - int bufSize; + size_t bufSize; std::vector demodOutputData; std::vector resampledOutputData; float aOutputCeil; float aOutputCeilMA; float aOutputCeilMAA; -}; \ No newline at end of file +}; diff --git a/src/modules/modem/ModemDigital.cpp b/src/modules/modem/ModemDigital.cpp index 7f1080d..ce2bbd6 100644 --- a/src/modules/modem/ModemDigital.cpp +++ b/src/modules/modem/ModemDigital.cpp @@ -54,7 +54,7 @@ void ModemDigital::updateDemodulatorLock(modem mod, float sensitivity) { } void ModemDigital::digitalStart(ModemKitDigital * /* kit */, modem /* mod */, ModemIQData *input) { - int bufSize = input->data.size(); + size_t bufSize = input->data.size(); if (demodOutputDataDigital.size() != bufSize) { if (demodOutputDataDigital.capacity() < bufSize) { diff --git a/src/modules/modem/analog/ModemAM.cpp b/src/modules/modem/analog/ModemAM.cpp index a4baa57..6a5eb3c 100644 --- a/src/modules/modem/analog/ModemAM.cpp +++ b/src/modules/modem/analog/ModemAM.cpp @@ -30,7 +30,7 @@ void ModemAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *au return; } - for (int i = 0; i < bufSize; i++) { + for (size_t i = 0; i < bufSize; i++) { ampmodem_demodulate(demodAM, input->data[i], &demodOutputData[i]); } diff --git a/src/modules/modem/analog/ModemDSB.cpp b/src/modules/modem/analog/ModemDSB.cpp index b0de272..34c0aed 100644 --- a/src/modules/modem/analog/ModemDSB.cpp +++ b/src/modules/modem/analog/ModemDSB.cpp @@ -30,7 +30,7 @@ void ModemDSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a return; } - for (int i = 0; i < bufSize; i++) { + for (size_t i = 0; i < bufSize; i++) { ampmodem_demodulate(demodAM_DSB, input->data[i], &demodOutputData[i]); } diff --git a/src/modules/modem/analog/ModemFMStereo.cpp b/src/modules/modem/analog/ModemFMStereo.cpp index 2d01d39..ba0a79b 100644 --- a/src/modules/modem/analog/ModemFMStereo.cpp +++ b/src/modules/modem/analog/ModemFMStereo.cpp @@ -105,7 +105,7 @@ void ModemFMStereo::disposeKit(ModemKit *kit) { void ModemFMStereo::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *audioOut) { ModemKitFMStereo *fmkit = (ModemKitFMStereo *)kit; - int bufSize = input->data.size(); + size_t bufSize = input->data.size(); liquid_float_complex u, v, w, x, y; double audio_resample_ratio = fmkit->audioResampleRatio; @@ -117,7 +117,7 @@ void ModemFMStereo::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInp demodOutputData.resize(bufSize); } - int audio_out_size = ceil((double) (bufSize) * audio_resample_ratio) + 512; + size_t audio_out_size = ceil((double) (bufSize) * audio_resample_ratio) + 512; freqdem_demodulate_block(demodFM, &input->data[0], bufSize, &demodOutputData[0]); @@ -141,7 +141,7 @@ void ModemFMStereo::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInp float phase_error = 0; - for (int i = 0; i < bufSize; i++) { + for (size_t i = 0; i < bufSize; i++) { // real -> complex firhilbf_r2c_execute(firStereoR2C, demodOutputData[i], &x); @@ -187,7 +187,7 @@ void ModemFMStereo::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInp audioOut->data.reserve(numAudioWritten * 2); } audioOut->data.resize(numAudioWritten * 2); - for (int i = 0; i < numAudioWritten; i++) { + for (size_t i = 0; i < numAudioWritten; i++) { float l, r; firfilt_rrrf_push(fmkit->firStereoLeft, 0.568 * (resampledOutputData[i] - (resampledStereoData[i]))); diff --git a/src/modules/modem/analog/ModemIQ.cpp b/src/modules/modem/analog/ModemIQ.cpp index 7976295..1f88c61 100644 --- a/src/modules/modem/analog/ModemIQ.cpp +++ b/src/modules/modem/analog/ModemIQ.cpp @@ -36,7 +36,7 @@ int ModemIQ::getDefaultSampleRate() { } void ModemIQ::demodulate(ModemKit * /* kit */, ModemIQData *input, AudioThreadInput *audioOut) { - int bufSize = input->data.size(); + size_t bufSize = input->data.size(); if (!bufSize) { input->decRefCount(); @@ -49,7 +49,7 @@ void ModemIQ::demodulate(ModemKit * /* kit */, ModemIQData *input, AudioThreadIn } audioOut->data.resize(bufSize * 2); - for (int i = 0; i < bufSize; i++) { + for (size_t i = 0; i < bufSize; i++) { audioOut->data[i * 2] = input->data[i].imag; audioOut->data[i * 2 + 1] = input->data[i].real; } diff --git a/src/modules/modem/analog/ModemLSB.cpp b/src/modules/modem/analog/ModemLSB.cpp index 0b98ccc..ace4f70 100644 --- a/src/modules/modem/analog/ModemLSB.cpp +++ b/src/modules/modem/analog/ModemLSB.cpp @@ -49,7 +49,7 @@ void ModemLSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a } liquid_float_complex x, y; - for (int i = 0; i < bufSize; i++) { // Reject upper band + for (size_t i = 0; i < bufSize; i++) { // Reject upper band nco_crcf_step(ssbShift); nco_crcf_mix_up(ssbShift, input->data[i], &x); iirfilt_crcf_execute(ssbFilt, x, &y); diff --git a/src/modules/modem/analog/ModemUSB.cpp b/src/modules/modem/analog/ModemUSB.cpp index e2b3d3c..5fe4759 100644 --- a/src/modules/modem/analog/ModemUSB.cpp +++ b/src/modules/modem/analog/ModemUSB.cpp @@ -49,7 +49,7 @@ void ModemUSB::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a } liquid_float_complex x, y; - for (int i = 0; i < bufSize; i++) { // Reject lower band + for (size_t i = 0; i < bufSize; i++) { // Reject lower band nco_crcf_step(ssbShift); nco_crcf_mix_down(ssbShift, input->data[i], &x); iirfilt_crcf_execute(ssbFilt, x, &y); diff --git a/src/modules/modem/digital/ModemAPSK.cpp b/src/modules/modem/digital/ModemAPSK.cpp index 8d4ffc6..4030521 100644 --- a/src/modules/modem/digital/ModemAPSK.cpp +++ b/src/modules/modem/digital/ModemAPSK.cpp @@ -99,7 +99,7 @@ void ModemAPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * digitalStart(dkit, demodAPSK, input); - for (int i = 0, bufSize = input->data.size(); i < bufSize; i++) { + for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) { modem_demodulate(demodAPSK, input->data[i], &demodOutputDataDigital[i]); } diff --git a/src/modules/modem/digital/ModemASK.cpp b/src/modules/modem/digital/ModemASK.cpp index f952a55..08eb8d4 100644 --- a/src/modules/modem/digital/ModemASK.cpp +++ b/src/modules/modem/digital/ModemASK.cpp @@ -104,10 +104,10 @@ void ModemASK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a digitalStart(dkit, demodASK, input); - for (int i = 0, bufSize = input->data.size(); i < bufSize; i++) { + for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) { modem_demodulate(demodASK, input->data[i], &demodOutputDataDigital[i]); } updateDemodulatorLock(demodASK, 0.005f); digitalFinish(dkit, demodASK); -} \ No newline at end of file +} diff --git a/src/modules/modem/digital/ModemBPSK.cpp b/src/modules/modem/digital/ModemBPSK.cpp index bd82d88..ba06f98 100644 --- a/src/modules/modem/digital/ModemBPSK.cpp +++ b/src/modules/modem/digital/ModemBPSK.cpp @@ -20,10 +20,10 @@ void ModemBPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodBPSK, input); - for (int i = 0, bufSize=input->data.size(); i < bufSize; i++) { + for (size_t i = 0, bufSize=input->data.size(); i < bufSize; i++) { modem_demodulate(demodBPSK, input->data[i], &demodOutputDataDigital[i]); } updateDemodulatorLock(demodBPSK, 0.005f); digitalFinish(dkit, demodBPSK); -} \ No newline at end of file +} diff --git a/src/modules/modem/digital/ModemDPSK.cpp b/src/modules/modem/digital/ModemDPSK.cpp index 13f5083..1427ea4 100644 --- a/src/modules/modem/digital/ModemDPSK.cpp +++ b/src/modules/modem/digital/ModemDPSK.cpp @@ -105,10 +105,10 @@ void ModemDPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * digitalStart(dkit, demodDPSK, input); - for (int i = 0, bufSize = input->data.size(); i < bufSize; i++) { + for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) { modem_demodulate(demodDPSK, input->data[i], &demodOutputDataDigital[i]); } updateDemodulatorLock(demodDPSK, 0.005f); digitalFinish(dkit, demodDPSK); -} \ No newline at end of file +} diff --git a/src/modules/modem/digital/ModemGMSK.cpp b/src/modules/modem/digital/ModemGMSK.cpp index 9786103..d6ca152 100644 --- a/src/modules/modem/digital/ModemGMSK.cpp +++ b/src/modules/modem/digital/ModemGMSK.cpp @@ -121,7 +121,7 @@ void ModemGMSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * dkit->inputBuffer.insert(dkit->inputBuffer.end(),input->data.begin(),input->data.end()); int numProcessed = 0; - for (int i = 0, iMax = dkit->inputBuffer.size()/dkit->sps; i < iMax; i+= dkit->sps) { + for (size_t i = 0, iMax = dkit->inputBuffer.size()/dkit->sps; i < iMax; i+= dkit->sps) { gmskdem_demodulate(dkit->demodGMSK, &input->data[i],&sym_out); outStream << sym_out; numProcessed += dkit->sps; @@ -130,4 +130,4 @@ void ModemGMSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * dkit->inputBuffer.erase(dkit->inputBuffer.begin(),dkit->inputBuffer.begin()+numProcessed); digitalFinish(dkit, nullptr); -} \ No newline at end of file +} diff --git a/src/modules/modem/digital/ModemOOK.cpp b/src/modules/modem/digital/ModemOOK.cpp index faef9d2..8236015 100644 --- a/src/modules/modem/digital/ModemOOK.cpp +++ b/src/modules/modem/digital/ModemOOK.cpp @@ -27,10 +27,10 @@ void ModemOOK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodOOK, input); - for (int i = 0, bufSize=input->data.size(); i < bufSize; i++) { + for (size_t i = 0, bufSize=input->data.size(); i < bufSize; i++) { modem_demodulate(demodOOK, input->data[i], &demodOutputDataDigital[i]); } updateDemodulatorLock(demodOOK, 0.005f); digitalFinish(dkit, demodOOK); -} \ No newline at end of file +} diff --git a/src/modules/modem/digital/ModemPSK.cpp b/src/modules/modem/digital/ModemPSK.cpp index 8789435..179c965 100644 --- a/src/modules/modem/digital/ModemPSK.cpp +++ b/src/modules/modem/digital/ModemPSK.cpp @@ -106,10 +106,10 @@ void ModemPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a digitalStart(dkit, demodPSK, input); - for (int i = 0, bufSize = input->data.size(); i < bufSize; i++) { + for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) { modem_demodulate(demodPSK, input->data[i], &demodOutputDataDigital[i]); } updateDemodulatorLock(demodPSK, 0.005f); digitalFinish(dkit, demodPSK); -} \ No newline at end of file +} diff --git a/src/modules/modem/digital/ModemQAM.cpp b/src/modules/modem/digital/ModemQAM.cpp index c593357..b079479 100644 --- a/src/modules/modem/digital/ModemQAM.cpp +++ b/src/modules/modem/digital/ModemQAM.cpp @@ -98,7 +98,7 @@ void ModemQAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *a ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodQAM, input); - for (int i = 0, bufSize = input->data.size(); i < bufSize; i++) { + for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) { modem_demodulate(demodQAM, input->data[i], &demodOutputDataDigital[i]); } updateDemodulatorLock(demodQAM, 0.5f); diff --git a/src/modules/modem/digital/ModemQPSK.cpp b/src/modules/modem/digital/ModemQPSK.cpp index 4754e78..bfe6d73 100644 --- a/src/modules/modem/digital/ModemQPSK.cpp +++ b/src/modules/modem/digital/ModemQPSK.cpp @@ -20,10 +20,10 @@ void ModemQPSK::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodQPSK, input); - for (int i = 0, bufSize = input->data.size(); i < bufSize; i++) { + for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) { modem_demodulate(demodQPSK, input->data[i], &demodOutputDataDigital[i]); } updateDemodulatorLock(demodQPSK, 0.8f); digitalFinish(dkit, demodQPSK); -} \ No newline at end of file +} diff --git a/src/modules/modem/digital/ModemSQAM.cpp b/src/modules/modem/digital/ModemSQAM.cpp index f2ef57f..cb8ee39 100644 --- a/src/modules/modem/digital/ModemSQAM.cpp +++ b/src/modules/modem/digital/ModemSQAM.cpp @@ -69,10 +69,10 @@ void ModemSQAM::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput * digitalStart(dkit, demodSQAM, input); - for (int i = 0, bufSize = input->data.size(); i < bufSize; i++) { + for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) { modem_demodulate(demodSQAM, input->data[i], &demodOutputDataDigital[i]); } updateDemodulatorLock(demodSQAM, 0.005f); digitalFinish(dkit, demodSQAM); -} \ No newline at end of file +} diff --git a/src/modules/modem/digital/ModemST.cpp b/src/modules/modem/digital/ModemST.cpp index b827fc2..2d58e29 100644 --- a/src/modules/modem/digital/ModemST.cpp +++ b/src/modules/modem/digital/ModemST.cpp @@ -20,10 +20,10 @@ void ModemST::demodulate(ModemKit *kit, ModemIQData *input, AudioThreadInput *au ModemKitDigital *dkit = (ModemKitDigital *)kit; digitalStart(dkit, demodST, input); - for (int i = 0, bufSize = input->data.size(); i < bufSize; i++) { + for (size_t i = 0, bufSize = input->data.size(); i < bufSize; i++) { modem_demodulate(demodST, input->data[i], &demodOutputDataDigital[i]); } updateDemodulatorLock(demodST, 0.005f); digitalFinish(dkit, demodST); -} \ No newline at end of file +} diff --git a/src/process/FFTDataDistributor.cpp b/src/process/FFTDataDistributor.cpp index 1e92d9b..c4c5632 100644 --- a/src/process/FFTDataDistributor.cpp +++ b/src/process/FFTDataDistributor.cpp @@ -4,15 +4,15 @@ FFTDataDistributor::FFTDataDistributor() : outputBuffers("FFTDataDistributorBuff bufferedItems = 0; } -void FFTDataDistributor::setFFTSize(int fftSize) { +void FFTDataDistributor::setFFTSize(unsigned int fftSize) { this->fftSize = fftSize; } -void FFTDataDistributor::setLinesPerSecond(int lines) { +void FFTDataDistributor::setLinesPerSecond(unsigned int lines) { this->linesPerSecond = lines; } -int FFTDataDistributor::getLinesPerSecond() { +unsigned int FFTDataDistributor::getLinesPerSecond() { return this->linesPerSecond; } @@ -63,7 +63,7 @@ void FFTDataDistributor::process() { lineRateAccum += (lineRateStep * ((double)bufferedItems/(double)fftSize)); numProcessed = bufferedItems; } else { - for (int i = 0, iMax = bufferedItems; i < iMax; i += fftSize) { + for (unsigned int i = 0, iMax = bufferedItems; i < iMax; i += fftSize) { if ((i + fftSize) > iMax) { break; } diff --git a/src/process/FFTDataDistributor.h b/src/process/FFTDataDistributor.h index 677248e..da58828 100644 --- a/src/process/FFTDataDistributor.h +++ b/src/process/FFTDataDistributor.h @@ -8,17 +8,17 @@ class FFTDataDistributor : public VisualProcessor { public: FFTDataDistributor(); - void setFFTSize(int fftSize); - void setLinesPerSecond(int lines); - int getLinesPerSecond(); + void setFFTSize(unsigned int fftSize); + void setLinesPerSecond(unsigned int lines); + unsigned int getLinesPerSecond(); protected: void process(); DemodulatorThreadIQData inputBuffer, tempBuffer; ReBuffer outputBuffers; - int fftSize; - int linesPerSecond; + unsigned int fftSize; + unsigned int linesPerSecond; double lineRateAccum; - int bufferMax, bufferOffset, bufferedItems; + size_t bufferMax, bufferOffset, bufferedItems; }; diff --git a/src/sdr/SDRDeviceInfo.cpp b/src/sdr/SDRDeviceInfo.cpp index a60202a..b95411d 100644 --- a/src/sdr/SDRDeviceInfo.cpp +++ b/src/sdr/SDRDeviceInfo.cpp @@ -1,5 +1,6 @@ #include "SDRDeviceInfo.h" #include +#include SDRDeviceInfo::SDRDeviceInfo() : name(""), serial(""), available(false), remote(false), manual(false), active(false), soapyDevice(nullptr) { diff --git a/src/sdr/SDRDeviceInfo.h b/src/sdr/SDRDeviceInfo.h index 086efea..77714de 100644 --- a/src/sdr/SDRDeviceInfo.h +++ b/src/sdr/SDRDeviceInfo.h @@ -2,6 +2,7 @@ #include #include +#include #include #include diff --git a/src/util/GLFont.cpp b/src/util/GLFont.cpp index dca15ae..76d1cb1 100644 --- a/src/util/GLFont.cpp +++ b/src/util/GLFont.cpp @@ -130,7 +130,7 @@ std::string GLFont::nextParam(std::istringstream &str) { std::string GLFont::getParamKey(std::string param_str) { std::string keyName; - int eqpos = param_str.find("="); + size_t eqpos = param_str.find("="); if (eqpos != std::string::npos) { keyName = param_str.substr(0, eqpos); @@ -142,7 +142,7 @@ std::string GLFont::getParamKey(std::string param_str) { std::string GLFont::getParamValue(std::string param_str) { std::string value; - int eqpos = param_str.find("="); + size_t eqpos = param_str.find("="); if (eqpos != std::string::npos) { value = param_str.substr(eqpos + 1); diff --git a/src/util/Gradient.cpp b/src/util/Gradient.cpp index fed05ac..7279296 100644 --- a/src/util/Gradient.cpp +++ b/src/util/Gradient.cpp @@ -21,9 +21,9 @@ std::vector &Gradient::getBlue() { } void Gradient::generate(unsigned int len) { - int chunk_size = len / (colors.size() - 1); + unsigned int chunk_size = len / (colors.size() - 1); - int p = 0; + unsigned int p = 0; r_val.resize(len); g_val.resize(len); b_val.resize(len);