Linux - missing header and warning fixes

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;

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()) {

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();

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;
         }
     }

src/modules/modem/ModemAnalog.h

@@ -24,11 +24,11 @@ public:
     virtual std::vector<float> *getDemodOutputData();
     virtual std::vector<float> *getResampledOutputData();
 protected:
-    int bufSize;
+    size_t bufSize;
     std::vector<float> demodOutputData;
     std::vector<float> resampledOutputData;
 
     float aOutputCeil;
     float aOutputCeilMA;
     float aOutputCeilMAA;
-};
+};

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) {

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]);
 	}
     

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]);
 	}
     

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])));

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;
     }

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);

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);

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]);
     }
     

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);
-}
+}

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);
-}
+}

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);
-}
+}

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);
-}
+}

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);
-}
+}

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);
-}
+}

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);

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);
-}
+}

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);
-}
+}

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);
-}
+}

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;
 					}

src/process/FFTDataDistributor.h

@@ -8,17 +8,17 @@
 class FFTDataDistributor : public VisualProcessor<DemodulatorThreadIQData, DemodulatorThreadIQData> {
 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<DemodulatorThreadIQData> outputBuffers;
-    int fftSize;
-    int linesPerSecond;
+    unsigned int fftSize;
+    unsigned int linesPerSecond;
     double lineRateAccum;
-    int bufferMax, bufferOffset, bufferedItems;
+    size_t bufferMax, bufferOffset, bufferedItems;
 };

src/sdr/SDRDeviceInfo.cpp

@@ -1,5 +1,6 @@
 #include "SDRDeviceInfo.h"
 #include <cstdlib>
+#include <algorithm>
 
 SDRDeviceInfo::SDRDeviceInfo() : name(""), serial(""), available(false), remote(false), manual(false), active(false), soapyDevice(nullptr) {
 

src/sdr/SDRDeviceInfo.h

@@ -2,6 +2,7 @@
 
 #include <string>
 #include <vector>
+#include <atomic>
 
 #include <SoapySDR/Types.hpp>
 #include <SoapySDR/Device.hpp>

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);

src/util/Gradient.cpp

@@ -21,9 +21,9 @@ std::vector<float> &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);