diff --git a/CMakeLists.txt b/CMakeLists.txt index 08525c2d1..062a696f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -529,6 +529,9 @@ endif() ############################################################################## +# Compiler flags. +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -fmax-errors=10 -std=c++11 -O2 -ffast-math -ftree-vectorize ${EXTRA_FLAGS}") + set(sdrangel_SOURCES app/main.cpp ) diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt index e054d9e74..c87807943 100644 --- a/devices/CMakeLists.txt +++ b/devices/CMakeLists.txt @@ -6,7 +6,6 @@ if (BUILD_DEBIAN) add_subdirectory(bladerf) add_subdirectory(hackrf) add_subdirectory(limesdr) - add_subdirectory(sdrdaemon) else(BUILD_DEBIAN) find_package(LibBLADERF) if(LIBUSB_FOUND AND LIBBLADERF_FOUND) @@ -23,9 +22,4 @@ else(BUILD_DEBIAN) add_subdirectory(limesdr) endif(LIBUSB_FOUND AND LIMESUITE_FOUND) - find_package(CM256cc) - if(CM256CC_FOUND) - add_subdirectory(sdrdaemon) - endif(CM256CC_FOUND AND LIBNANOMSG_FOUND) - endif (BUILD_DEBIAN) diff --git a/devices/bladerf/devicebladerf.cpp b/devices/bladerf/devicebladerf.cpp index 2e89d0508..ffa065cb4 100644 --- a/devices/bladerf/devicebladerf.cpp +++ b/devices/bladerf/devicebladerf.cpp @@ -20,10 +20,9 @@ bool DeviceBladeRF::open_bladerf(struct bladerf **dev, const char *serial) { - int res; int fpga_loaded; - if ((*dev = open_bladerf_from_serial(0)) == 0) + if ((*dev = open_bladerf_from_serial(serial)) == 0) { fprintf(stderr, "DeviceBladeRF::open_bladerf: could not open BladeRF\n"); return false; diff --git a/devices/limesdr/devicelimesdrparam.h b/devices/limesdr/devicelimesdrparam.h index 4f3c20c67..779eb35b9 100644 --- a/devices/limesdr/devicelimesdrparam.h +++ b/devices/limesdr/devicelimesdrparam.h @@ -29,8 +29,8 @@ struct DeviceLimeSDRParams { lms_device_t *m_dev; //!< device handle - int m_nbRxChannels; //!< number of Rx channels (normally 2, we'll see if we really use it...) - int m_nbTxChannels; //!< number of Tx channels (normally 2, we'll see if we really use it...) + uint32_t m_nbRxChannels; //!< number of Rx channels (normally 2, we'll see if we really use it...) + uint32_t m_nbTxChannels; //!< number of Tx channels (normally 2, we'll see if we really use it...) lms_range_t m_lpfRangeRx; //!< Low pass filter range information (Rx side) lms_range_t m_lpfRangeTx; //!< Low pass filter range information (Tx side) lms_range_t m_loRangeRx; //!< LO range for Rx diff --git a/devices/sdrdaemon/sdrdaemonfecbuffer.cpp b/devices/sdrdaemon/sdrdaemonfecbuffer.cpp index 4a5f1e2e4..bb8629627 100644 --- a/devices/sdrdaemon/sdrdaemonfecbuffer.cpp +++ b/devices/sdrdaemon/sdrdaemonfecbuffer.cpp @@ -28,24 +28,24 @@ const int SDRdaemonFECBuffer::m_sampleSize = 2; const int SDRdaemonFECBuffer::m_iqSampleSize = 2 * m_sampleSize; SDRdaemonFECBuffer::SDRdaemonFECBuffer(uint32_t throttlems) : - m_frameHead(0), m_decoderIndexHead(nbDecoderSlots/2), + m_frameHead(0), m_curNbBlocks(0), m_minNbBlocks(256), + m_curOriginalBlocks(0), m_minOriginalBlocks(128), m_curNbRecovery(0), m_maxNbRecovery(0), m_framesDecoded(true), - m_throttlemsNominal(throttlems), m_readIndex(0), + m_throttlemsNominal(throttlems), m_readBuffer(0), m_readSize(0), m_bufferLenSec(0.0f), - m_nbReads(0), - m_nbWrites(0), - m_balCorrection(0), - m_balCorrLimit(0), - m_curOriginalBlocks(0) + m_nbReads(0), + m_nbWrites(0), + m_balCorrection(0), + m_balCorrLimit(0) { m_currentMeta.init(); m_framesNbBytes = nbDecoderSlots * sizeof(BufferFrame); @@ -135,7 +135,7 @@ void SDRdaemonFECBuffer::rwCorrectionEstimate(int slotIndex) { int targetPivotSlot = (slotIndex + (nbDecoderSlots/2)) % nbDecoderSlots; // slot at half buffer opposite of current write slot int targetPivotIndex = targetPivotSlot * sizeof(BufferFrame); // buffer index corresponding to start of above slot - int normalizedReadIndex = (m_readIndex < targetPivotIndex ? m_readIndex + nbDecoderSlots * sizeof(BufferFrame) : m_readIndex) + uint32_t normalizedReadIndex = (m_readIndex < targetPivotIndex ? m_readIndex + nbDecoderSlots * sizeof(BufferFrame) : m_readIndex) - (targetPivotSlot * sizeof(BufferFrame)); // normalize read index so it is positive and zero at start of pivot slot int dBytes; int rwDelta = (m_nbReads * m_readNbBytes) - (m_nbWrites * sizeof(BufferFrame)); @@ -157,8 +157,6 @@ void SDRdaemonFECBuffer::rwCorrectionEstimate(int slotIndex) m_balCorrection = m_balCorrLimit; } - float rwRatio = (float) (m_nbWrites * sizeof(BufferFrame)) / (float) (m_nbReads * m_readNbBytes); - m_nbReads = 0; m_nbWrites = 0; } @@ -189,7 +187,7 @@ void SDRdaemonFECBuffer::checkSlotData(int slotIndex) } } -void SDRdaemonFECBuffer::writeData(char *array, uint32_t length) +void SDRdaemonFECBuffer::writeData(char *array) { SuperBlock *superBlock = (SuperBlock *) array; int frameIndex = superBlock->header.frameIndex; @@ -322,80 +320,7 @@ void SDRdaemonFECBuffer::writeData(char *array, uint32_t length) } // decode } -void SDRdaemonFECBuffer::writeData0(char *array, uint32_t length) -{ -// Kept as comments for the out of sync blocks algorithms -// assert(length == m_udpPayloadSize); -// -// bool dataAvailable = false; -// SuperBlock *superBlock = (SuperBlock *) array; -// int frameIndex = superBlock->header.frameIndex; -// int decoderIndex = frameIndex % nbDecoderSlots; -// int blockIndex = superBlock->header.blockIndex; -// -//// qDebug() << "SDRdaemonFECBuffer::writeData:" -//// << " frameIndex: " << frameIndex -//// << " decoderIndex: " << decoderIndex -//// << " blockIndex: " << blockIndex; -// -// if (m_frameHead == -1) // initial state -// { -// m_decoderIndexHead = decoderIndex; // new decoder slot head -// m_frameHead = frameIndex; -// initReadIndex(); // reset read index -// initDecodeAllSlots(); // initialize all slots -// } -// else -// { -// int frameDelta = m_frameHead - frameIndex; -// -// if (frameDelta < 0) -// { -// if (-frameDelta < nbDecoderSlots) // new frame head not too new -// { -// //qDebug() << "SDRdaemonFECBuffer::writeData: new frame head (1): " << frameIndex << ":" << frameDelta << ":" << decoderIndex; -// m_decoderIndexHead = decoderIndex; // new decoder slot head -// m_frameHead = frameIndex; -// checkSlotData(decoderIndex); -// dataAvailable = true; -// initDecodeSlot(decoderIndex); // collect stats and re-initialize current slot -// } -// else if (-frameDelta <= 65536 - nbDecoderSlots) // loss of sync start over -// { -// //qDebug() << "SDRdaemonFECBuffer::writeData: loss of sync start over (1)" << frameIndex << ":" << frameDelta << ":" << decoderIndex; -// m_decoderIndexHead = decoderIndex; // new decoder slot head -// m_frameHead = frameIndex; -// initReadIndex(); // reset read index -// initDecodeAllSlots(); // re-initialize all slots -// } -// } -// else -// { -// if (frameDelta > 65536 - nbDecoderSlots) // new frame head not too new -// { -// //qDebug() << "SDRdaemonFECBuffer::writeData: new frame head (2): " << frameIndex << ":" << frameDelta << ":" << decoderIndex; -// m_decoderIndexHead = decoderIndex; // new decoder slot head -// m_frameHead = frameIndex; -// checkSlotData(decoderIndex); -// dataAvailable = true; -// initDecodeSlot(decoderIndex); // collect stats and re-initialize current slot -// } -// else if (frameDelta >= nbDecoderSlots) // loss of sync start over -// { -// //qDebug() << "SDRdaemonFECBuffer::writeData: loss of sync start over (2)" << frameIndex << ":" << frameDelta << ":" << decoderIndex; -// m_decoderIndexHead = decoderIndex; // new decoder slot head -// m_frameHead = frameIndex; -// initReadIndex(); // reset read index -// initDecodeAllSlots(); // re-initialize all slots -// } -// } -// } -// -// // decoderIndex should now be correctly set -// -} - -uint8_t *SDRdaemonFECBuffer::readData(int32_t length) +uint8_t *SDRdaemonFECBuffer::readData(uint32_t length) { uint8_t *buffer = (uint8_t *) m_frames; uint32_t readIndex = m_readIndex; diff --git a/devices/sdrdaemon/sdrdaemonfecbuffer.h b/devices/sdrdaemon/sdrdaemonfecbuffer.h index b4dbe2dc2..6f2d58fd9 100644 --- a/devices/sdrdaemon/sdrdaemonfecbuffer.h +++ b/devices/sdrdaemon/sdrdaemonfecbuffer.h @@ -87,9 +87,8 @@ public: ~SDRdaemonFECBuffer(); // R/W operations - void writeData(char *array, uint32_t length); //!< Write data into buffer. - void writeData0(char *array, uint32_t length); //!< Write data into buffer. - uint8_t *readData(int32_t length); //!< Read data from buffer + void writeData(char *array); //!< Write data into buffer. + uint8_t *readData(uint32_t length); //!< Read data from buffer // meta data const MetaDataFEC& getCurrentMeta() const { return m_currentMeta; } @@ -148,7 +147,6 @@ public: { int32_t val = (m_wrDeltaEstimate * 100) / (int32_t) m_framesNbBytes; int32_t ret = val < 0 ? -val - 50 : 50 -val; - int32_t rp = (m_readIndex * 100) / (int32_t) m_framesNbBytes; return ret; } else @@ -189,7 +187,7 @@ private: CM256::cm256_encoder_params m_paramsCM256; //!< CM256 decoder parameters block DecoderSlot m_decoderSlots[nbDecoderSlots]; //!< CM256 decoding control/buffer slots BufferFrame m_frames[nbDecoderSlots]; //!< Samples buffer - int m_framesNbBytes; //!< Number of bytes in samples buffer + uint32_t m_framesNbBytes; //!< Number of bytes in samples buffer int m_decoderIndexHead; //!< index of the current head frame slot in decoding slots int m_frameHead; //!< index of the current head frame sent int m_curNbBlocks; //!< (stats) instantaneous number of blocks received diff --git a/plugins/channelrx/chanalyzer/chanalyzer.cpp b/plugins/channelrx/chanalyzer/chanalyzer.cpp index bf3da6141..641f75037 100644 --- a/plugins/channelrx/chanalyzer/chanalyzer.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzer.cpp @@ -60,7 +60,7 @@ void ChannelAnalyzer::configure(MessageQueue* messageQueue, messageQueue->push(cmd); } -void ChannelAnalyzer::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly) +void ChannelAnalyzer::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused))) { fftfilt::cmplx *sideband; int n_out; diff --git a/plugins/channelrx/chanalyzer/chanalyzergui.cpp b/plugins/channelrx/chanalyzer/chanalyzergui.cpp index 399eb9990..0cc9b561d 100644 --- a/plugins/channelrx/chanalyzer/chanalyzergui.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzergui.cpp @@ -14,14 +14,14 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include "../../channelrx/chanalyzer/chanalyzergui.h" +#include "chanalyzergui.h" #include #include #include #include -#include "../../../sdrbase/dsp/threadedbasebandsamplesink.h" +#include "dsp/threadedbasebandsamplesink.h" #include "ui_chanalyzergui.h" #include "dsp/spectrumscopecombovis.h" #include "dsp/spectrumvis.h" @@ -35,7 +35,7 @@ #include "dsp/dspengine.h" #include "mainwindow.h" -#include "../../channelrx/chanalyzer/chanalyzer.h" +#include "chanalyzer.h" const QString ChannelAnalyzerGUI::m_channelID = "org.f4exb.sdrangelove.channel.chanalyzer"; @@ -154,7 +154,7 @@ bool ChannelAnalyzerGUI::deserialize(const QByteArray& data) } } -bool ChannelAnalyzerGUI::handleMessage(const Message& message) +bool ChannelAnalyzerGUI::handleMessage(const Message& message __attribute__((unused))) { return false; } @@ -289,7 +289,7 @@ void ChannelAnalyzerGUI::on_ssb_toggled(bool checked) } } -void ChannelAnalyzerGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void ChannelAnalyzerGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { /* if((widget == ui->spectrumContainer) && (m_ssbDemod != NULL)) diff --git a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp index a446db642..d7c2f1d30 100644 --- a/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp +++ b/plugins/channelrx/chanalyzer/chanalyzerplugin.cpp @@ -46,5 +46,5 @@ PluginGUI* ChannelAnalyzerPlugin::createRxChannel(const QString& channelName, De void ChannelAnalyzerPlugin::createInstanceChannelAnalyzer(DeviceSourceAPI *deviceAPI) { - ChannelAnalyzerGUI* gui = ChannelAnalyzerGUI::create(m_pluginAPI, deviceAPI); + ChannelAnalyzerGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channelrx/chanalyzerng/chanalyzerng.cpp b/plugins/channelrx/chanalyzerng/chanalyzerng.cpp index 5a8e0f91e..f27ea6407 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzerng.cpp +++ b/plugins/channelrx/chanalyzerng/chanalyzerng.cpp @@ -58,9 +58,9 @@ void ChannelAnalyzerNG::configure(MessageQueue* messageQueue, messageQueue->push(cmd); } -void ChannelAnalyzerNG::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly) +void ChannelAnalyzerNG::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused))) { - fftfilt::cmplx *sideband; + fftfilt::cmplx *sideband = 0; Complex ci; m_settingsMutex.lock(); @@ -104,8 +104,6 @@ void ChannelAnalyzerNG::stop() bool ChannelAnalyzerNG::handleMessage(const Message& cmd) { - float bandwidth, lowCutoff; - qDebug() << "ChannelAnalyzerNG::handleMessage: " << cmd.getIdentifier(); if (DownChannelizer::MsgChannelizerNotification::match(cmd)) diff --git a/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp b/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp index b5d135fa4..a7d0f3c78 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp +++ b/plugins/channelrx/chanalyzerng/chanalyzernggui.cpp @@ -157,7 +157,7 @@ bool ChannelAnalyzerNGGUI::deserialize(const QByteArray& data) } } -bool ChannelAnalyzerNGGUI::handleMessage(const Message& message) +bool ChannelAnalyzerNGGUI::handleMessage(const Message& message __attribute__((unused))) { return false; } @@ -194,7 +194,7 @@ void ChannelAnalyzerNGGUI::on_channelSampleRate_changed(quint64 value) } } -void ChannelAnalyzerNGGUI::on_useRationalDownsampler_toggled(bool checked) +void ChannelAnalyzerNGGUI::on_useRationalDownsampler_toggled(bool checked __attribute__((unused))) { setNewFinalRate(m_spanLog2); applySettings(); @@ -313,7 +313,7 @@ void ChannelAnalyzerNGGUI::on_ssb_toggled(bool checked) } } -void ChannelAnalyzerNGGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void ChannelAnalyzerNGGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { /* if((widget == ui->spectrumContainer) && (m_ssbDemod != NULL)) diff --git a/plugins/channelrx/chanalyzerng/chanalyzerngplugin.cpp b/plugins/channelrx/chanalyzerng/chanalyzerngplugin.cpp index 6b21561ec..5758f9788 100644 --- a/plugins/channelrx/chanalyzerng/chanalyzerngplugin.cpp +++ b/plugins/channelrx/chanalyzerng/chanalyzerngplugin.cpp @@ -61,5 +61,5 @@ PluginGUI* ChannelAnalyzerNGPlugin::createRxChannel(const QString& channelName, void ChannelAnalyzerNGPlugin::createInstanceChannelAnalyzer(DeviceSourceAPI *deviceAPI) { - ChannelAnalyzerNGGUI* gui = ChannelAnalyzerNGGUI::create(m_pluginAPI, deviceAPI); + ChannelAnalyzerNGGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channelrx/demodam/amdemod.cpp b/plugins/channelrx/demodam/amdemod.cpp index fd2dde3a4..622619b97 100644 --- a/plugins/channelrx/demodam/amdemod.cpp +++ b/plugins/channelrx/demodam/amdemod.cpp @@ -29,13 +29,13 @@ MESSAGE_CLASS_DEFINITION(AMDemod::MsgConfigureAMDemod, Message) AMDemod::AMDemod() : m_squelchOpen(false), - m_audioFifo(4, 48000), - m_settingsMutex(QMutex::Recursive), m_magsqSum(0.0f), m_magsqPeak(0.0f), m_magsqCount(0), m_movingAverage(40, 0), - m_volumeAGC(4800, 1.0) + m_volumeAGC(4800, 1.0), + m_audioFifo(4, 48000), + m_settingsMutex(QMutex::Recursive) { setObjectName("AMDemod"); @@ -69,7 +69,7 @@ void AMDemod::configure(MessageQueue* messageQueue, Real rfBandwidth, Real volum messageQueue->push(cmd); } -void AMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst) +void AMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst __attribute__((unused))) { Complex ci; diff --git a/plugins/channelrx/demodam/amdemod.h b/plugins/channelrx/demodam/amdemod.h index 18d4b5824..a4b1720b7 100644 --- a/plugins/channelrx/demodam/amdemod.h +++ b/plugins/channelrx/demodam/amdemod.h @@ -129,7 +129,7 @@ private: Real m_interpolatorDistanceRemain; Real m_squelchLevel; - int m_squelchCount; + uint32_t m_squelchCount; bool m_squelchOpen; double m_magsq; double m_magsqSum; diff --git a/plugins/channelrx/demodam/amdemodgui.cpp b/plugins/channelrx/demodam/amdemodgui.cpp index 55649ad92..4fc448eae 100644 --- a/plugins/channelrx/demodam/amdemodgui.cpp +++ b/plugins/channelrx/demodam/amdemodgui.cpp @@ -144,7 +144,7 @@ bool AMDemodGUI::deserialize(const QByteArray& data) } } -bool AMDemodGUI::handleMessage(const Message& message) +bool AMDemodGUI::handleMessage(const Message& message __attribute__((unused))) { return false; } @@ -159,7 +159,7 @@ void AMDemodGUI::on_deltaFrequency_changed(qint64 value) m_channelMarker.setCenterFrequency(value); } -void AMDemodGUI::on_bandpassEnable_toggled(bool checked) +void AMDemodGUI::on_bandpassEnable_toggled(bool checked __attribute__((unused))) { applySettings(); } @@ -183,12 +183,12 @@ void AMDemodGUI::on_squelch_valueChanged(int value) applySettings(); } -void AMDemodGUI::on_audioMute_toggled(bool checked) +void AMDemodGUI::on_audioMute_toggled(bool checked __attribute__((unused))) { applySettings(); } -void AMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void AMDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { /* if((widget == ui->spectrumContainer) && (m_nfmDemod != NULL)) diff --git a/plugins/channelrx/demodam/amdemodplugin.cpp b/plugins/channelrx/demodam/amdemodplugin.cpp index 0e89ade8e..2e4aed7ab 100644 --- a/plugins/channelrx/demodam/amdemodplugin.cpp +++ b/plugins/channelrx/demodam/amdemodplugin.cpp @@ -46,5 +46,5 @@ PluginGUI* AMDemodPlugin::createRxChannel(const QString& channelName, DeviceSour void AMDemodPlugin::createInstanceDemodAM(DeviceSourceAPI *deviceAPI) { - AMDemodGUI* gui = AMDemodGUI::create(m_pluginAPI, deviceAPI); + AMDemodGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channelrx/demodatv/atvdemod.cpp b/plugins/channelrx/demodatv/atvdemod.cpp index a76085e62..7d41a828c 100644 --- a/plugins/channelrx/demodatv/atvdemod.cpp +++ b/plugins/channelrx/demodatv/atvdemod.cpp @@ -33,32 +33,32 @@ const int ATVDemod::m_ssbFftLen = 1024; ATVDemod::ATVDemod(BasebandSampleSink* objScopeSink) : m_objScopeSink(objScopeSink), - m_objSettingsMutex(QMutex::Recursive), m_objRegisteredATVScreen(NULL), + m_intNumberSamplePerTop(0), m_intImageIndex(0), - m_intColIndex(0), - m_intSampleIndex(0), - m_intRowIndex(0), - m_intLineIndex(0), m_intSynchroPoints(0), m_blnSynchroDetected(false), m_blnVerticalSynchroDetected(false), + m_fltAmpLineAverage(0.0f), m_fltEffMin(2000000000.0f), m_fltEffMax(-2000000000.0f), m_fltAmpMin(-2000000000.0f), m_fltAmpMax(2000000000.0f), m_fltAmpDelta(1.0), - m_fltAmpLineAverage(0.0f), - m_intNumberSamplePerTop(0), + m_intColIndex(0), + m_intSampleIndex(0), + m_intRowIndex(0), + m_intLineIndex(0), + m_objAvgColIndex(3), + m_objMagSqAverage(40, 0), m_bfoPLL(200/1000000, 100/1000000, 0.01), m_bfoFilter(200.0, 1000000.0, 0.9), - m_interpolatorDistanceRemain(0.0f), m_interpolatorDistance(1.0f), + m_interpolatorDistanceRemain(0.0f), m_DSBFilter(0), m_DSBFilterBuffer(0), m_DSBFilterBufferIndex(0), - m_objAvgColIndex(3), - m_objMagSqAverage(40, 0) + m_objSettingsMutex(QMutex::Recursive) { setObjectName("ATVDemod"); @@ -143,26 +143,14 @@ void ATVDemod::configureRF( objMessageQueue->push(msgCmd); } -void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst) +void ATVDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst __attribute__((unused))) { - float fltDivSynchroBlack = 1.0f - m_objRunning.m_fltVoltLevelSynchroBlack; float fltI; float fltQ; - float fltNormI; - float fltNormQ; Complex ci; - float fltNorm=0.00f; - float fltVal; - int intVal; - qint16 * ptrBufferToRelease = 0; - bool blnComputeImage=false; - - int intSynchroTimeSamples= (3 * m_objRunningPrivate.m_intNumberSamplePerLine) / 4; - float fltSynchroTrameLevel = 0.5f*((float)intSynchroTimeSamples) * m_objRunning.m_fltVoltLevelSynchroBlack; - //********** Let's rock and roll buddy ! ********** m_objSettingsMutex.lock(); diff --git a/plugins/channelrx/demodatv/atvdemodgui.cpp b/plugins/channelrx/demodatv/atvdemodgui.cpp index 2824f7aa1..15c4976d1 100644 --- a/plugins/channelrx/demodatv/atvdemodgui.cpp +++ b/plugins/channelrx/demodatv/atvdemodgui.cpp @@ -140,7 +140,6 @@ bool ATVDemodGUI::deserialize(const QByteArray& arrData) if (d.getVersion() == 1) { QByteArray bytetmp; - uint32_t u32tmp; int tmp; bool booltmp; @@ -252,7 +251,7 @@ void ATVDemodGUI::handleSourceMessages() } } -void ATVDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void ATVDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { } @@ -276,8 +275,8 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceSourceAPI *objDeviceAPI, m_objChannelMarker(this), m_blnBasicSettingsShown(false), m_blnDoApplySettings(true), - m_intTickCount(0), - m_objMagSqAverage(40, 0) + m_objMagSqAverage(40, 0), + m_intTickCount(0) { ui->setupUi(this); setAttribute(Qt::WA_DeleteOnClose, true); @@ -548,31 +547,31 @@ void ATVDemodGUI::on_halfImage_clicked() applySettings(); } -void ATVDemodGUI::on_nbLines_currentIndexChanged(int index) +void ATVDemodGUI::on_nbLines_currentIndexChanged(int index __attribute__((unused))) { lineTimeUpdate(); topTimeUpdate(); applySettings(); } -void ATVDemodGUI::on_fps_currentIndexChanged(int index) +void ATVDemodGUI::on_fps_currentIndexChanged(int index __attribute__((unused))) { lineTimeUpdate(); topTimeUpdate(); applySettings(); } -void ATVDemodGUI::on_standard_currentIndexChanged(int index) +void ATVDemodGUI::on_standard_currentIndexChanged(int index __attribute__((unused))) { applySettings(); } -void ATVDemodGUI::on_reset_clicked(bool checked) +void ATVDemodGUI::on_reset_clicked(bool checked __attribute__((unused))) { resetToDefaults(); } -void ATVDemodGUI::on_modulation_currentIndexChanged(int index) +void ATVDemodGUI::on_modulation_currentIndexChanged(int index __attribute__((unused))) { setRFFiltersSlidersRange(m_objATVDemod->getEffectiveSampleRate()); setChannelMarkerBandwidth(); @@ -593,14 +592,14 @@ void ATVDemodGUI::on_rfOppBW_valueChanged(int value) applyRFSettings(); } -void ATVDemodGUI::on_rfFiltering_toggled(bool checked) +void ATVDemodGUI::on_rfFiltering_toggled(bool checked __attribute__((unused))) { setRFFiltersSlidersRange(m_objATVDemod->getEffectiveSampleRate()); setChannelMarkerBandwidth(); applyRFSettings(); } -void ATVDemodGUI::on_decimatorEnable_toggled(bool checked) +void ATVDemodGUI::on_decimatorEnable_toggled(bool checked __attribute__((unused))) { setChannelMarkerBandwidth(); applyRFSettings(); @@ -623,7 +622,7 @@ void ATVDemodGUI::on_fmDeviation_valueChanged(int value) applyRFSettings(); } -void ATVDemodGUI::on_screenTabWidget_currentChanged(int index) +void ATVDemodGUI::on_screenTabWidget_currentChanged(int index __attribute__((unused))) { applySettings(); } diff --git a/plugins/channelrx/demodatv/atvscreen.cpp b/plugins/channelrx/demodatv/atvscreen.cpp index a36562514..809398e48 100644 --- a/plugins/channelrx/demodatv/atvscreen.cpp +++ b/plugins/channelrx/demodatv/atvscreen.cpp @@ -161,7 +161,7 @@ void ATVScreen::paintGL() m_objMutex.unlock(); } -void ATVScreen::mousePressEvent(QMouseEvent* event) +void ATVScreen::mousePressEvent(QMouseEvent* event __attribute__((unused))) { } diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp index 4b7d3a30a..8eb25970d 100644 --- a/plugins/channelrx/demodbfm/bfmdemod.cpp +++ b/plugins/channelrx/demodbfm/bfmdemod.cpp @@ -36,10 +36,10 @@ const Real BFMDemod::default_deemphasis = 50.0; // 50 us BFMDemod::BFMDemod(BasebandSampleSink* sampleSink, RDSParser *rdsParser) : m_sampleSink(sampleSink), - m_rdsParser(rdsParser), m_audioFifo(4, 250000), m_settingsMutex(QMutex::Recursive), m_pilotPLL(19000/384000, 50/384000, 0.01), + m_rdsParser(rdsParser), m_deemphasisFilterX(default_deemphasis * 48000 * 1.0e-6), m_deemphasisFilterY(default_deemphasis * 48000 * 1.0e-6), m_fmExcursion(default_excursion) @@ -103,7 +103,7 @@ void BFMDemod::configure(MessageQueue* messageQueue, messageQueue->push(cmd); } -void BFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst) +void BFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst __attribute__((unused))) { Complex ci, cs, cr; fftfilt::cmplx *rf; @@ -182,7 +182,7 @@ void BFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto } } - Real sampleStereo; + Real sampleStereo = 0.0f; // Process stereo if stereo mode is selected diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp index 61984da5f..797a87ad0 100644 --- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp +++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp @@ -131,7 +131,6 @@ bool BFMDemodGUI::deserialize(const QByteArray& data) if (d.getVersion() == 1) { QByteArray bytetmp; - quint32 u32tmp; qint32 tmp; bool booltmp; @@ -183,7 +182,7 @@ bool BFMDemodGUI::deserialize(const QByteArray& data) } } -bool BFMDemodGUI::handleMessage(const Message& message) +bool BFMDemodGUI::handleMessage(const Message& message __attribute__((unused))) { return false; } @@ -233,7 +232,7 @@ void BFMDemodGUI::on_audioStereo_toggled(bool stereo) applySettings(); } -void BFMDemodGUI::on_lsbStereo_toggled(bool lsb) +void BFMDemodGUI::on_lsbStereo_toggled(bool lsb __attribute__((unused))) { applySettings(); } @@ -248,7 +247,7 @@ void BFMDemodGUI::on_rds_clicked() applySettings(); } -void BFMDemodGUI::on_clearData_clicked(bool checked) +void BFMDemodGUI::on_clearData_clicked(bool checked __attribute__((unused))) { if (ui->rds->isChecked()) { @@ -266,8 +265,10 @@ void BFMDemodGUI::on_clearData_clicked(bool checked) } } -void BFMDemodGUI::on_g14ProgServiceNames_currentIndexChanged(int index) +void BFMDemodGUI::on_g14ProgServiceNames_currentIndexChanged(int _index) { + uint32_t index = _index & 0x7FFFFFF; + if (index < m_g14ComboIndex.size()) { unsigned int piKey = m_g14ComboIndex[index]; @@ -309,26 +310,26 @@ void BFMDemodGUI::on_g14ProgServiceNames_currentIndexChanged(int index) } } -void BFMDemodGUI::on_g00AltFrequenciesBox_activated(int index) +void BFMDemodGUI::on_g00AltFrequenciesBox_activated(int index __attribute__((unused))) { qint64 f = (qint64) ((ui->g00AltFrequenciesBox->currentText()).toDouble() * 1e6); changeFrequency(f); } -void BFMDemodGUI::on_g14MappedFrequencies_activated(int index) +void BFMDemodGUI::on_g14MappedFrequencies_activated(int index __attribute__((unused))) { qint64 f = (qint64) ((ui->g14MappedFrequencies->currentText()).toDouble() * 1e6); changeFrequency(f); } -void BFMDemodGUI::on_g14AltFrequencies_activated(int index) +void BFMDemodGUI::on_g14AltFrequencies_activated(int index __attribute__((unused))) { qint64 f = (qint64) ((ui->g14AltFrequencies->currentText()).toDouble() * 1e6); changeFrequency(f); } -void BFMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void BFMDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { } diff --git a/plugins/channelrx/demodbfm/bfmplugin.cpp b/plugins/channelrx/demodbfm/bfmplugin.cpp index 45f927337..a6edc1bda 100644 --- a/plugins/channelrx/demodbfm/bfmplugin.cpp +++ b/plugins/channelrx/demodbfm/bfmplugin.cpp @@ -63,5 +63,5 @@ PluginGUI* BFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAP void BFMPlugin::createInstanceBFM(DeviceSourceAPI *deviceAPI) { - BFMDemodGUI* gui = BFMDemodGUI::create(m_pluginAPI, deviceAPI); + BFMDemodGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channelrx/demodbfm/rdsdemod.cpp b/plugins/channelrx/demodbfm/rdsdemod.cpp index b13e03cf0..97c1a21bb 100644 --- a/plugins/channelrx/demodbfm/rdsdemod.cpp +++ b/plugins/channelrx/demodbfm/rdsdemod.cpp @@ -53,7 +53,7 @@ RDSDemod::~RDSDemod() //delete m_socket; } -void RDSDemod::setSampleRate(int srate) /// FIXME: fix rate for now +void RDSDemod::setSampleRate(int srate __attribute__((unused))) /// FIXME: fix rate for now { } diff --git a/plugins/channelrx/demodbfm/rdsparser.cpp b/plugins/channelrx/demodbfm/rdsparser.cpp index 0a0694dcf..2e4433f59 100644 --- a/plugins/channelrx/demodbfm/rdsparser.cpp +++ b/plugins/channelrx/demodbfm/rdsparser.cpp @@ -383,7 +383,6 @@ void RDSParser::parseGroup(unsigned int *group) m_pi_program_type = (group[1] >> 5) & 0x1f; // "PTY" m_pi_country_identification = (m_pi_program_identification >> 12) & 0xf; m_pi_area_coverage_index = (m_pi_program_identification >> 8) & 0xf; - unsigned char pi_program_reference_number = m_pi_program_identification & 0xff; /* std::string pistring = str(boost::format("%04X") % m_pi_program_identification); @@ -466,7 +465,6 @@ void RDSParser::decode_type0(unsigned int *group, bool B) unsigned int no_af = 0; double af_1 = 0; double af_2 = 0; - char flagstring[8] = "0000000"; m_g0_count++; m_g0_updated = true; @@ -587,7 +585,6 @@ void RDSParser::decode_type0(unsigned int *group, bool B) double RDSParser::decode_af(unsigned int af_code) { - static unsigned int number_of_freqs = 0; static bool vhf_or_lfmf = 0; // 0 = vhf, 1 = lf/mf double alt_frequency = 0; // in kHz @@ -597,20 +594,17 @@ double RDSParser::decode_af(unsigned int af_code) ( af_code == 224) || // No AF exists ( af_code >= 251)) // not assigned { - number_of_freqs = 0; alt_frequency = 0; } if ((af_code >= 225) && (af_code <= 249)) // VHF frequencies follow { - number_of_freqs = af_code - 224; alt_frequency = 0; vhf_or_lfmf = 1; } if (af_code == 250) // an LF/MF frequency follows { - number_of_freqs = 1; alt_frequency = 0; vhf_or_lfmf = 0; } @@ -755,13 +749,13 @@ void RDSParser::decode_type3(unsigned int *group, bool B) if (variant_code == 0) { - int ltn = (message >> 6) & 0x3f; // location table number - bool afi = (message >> 5) & 0x1; // alternative freq. indicator - bool M = (message >> 4) & 0x1; // mode of transmission - bool I = (message >> 3) & 0x1; // international - bool N = (message >> 2) & 0x1; // national - bool R = (message >> 1) & 0x1; // regional - bool U = message & 0x1; // urban +// int ltn = (message >> 6) & 0x3f; // location table number +// bool afi = (message >> 5) & 0x1; // alternative freq. indicator +// bool M = (message >> 4) & 0x1; // mode of transmission +// bool I = (message >> 3) & 0x1; // international +// bool N = (message >> 2) & 0x1; // national +// bool R = (message >> 1) & 0x1; // regional +// bool U = message & 0x1; // urban /* qDebug() << "RDSParser::decode_type3: location table: " << ltn << " - " @@ -775,9 +769,9 @@ void RDSParser::decode_type3(unsigned int *group, bool B) } else if (variant_code==1) { - int G = (message >> 12) & 0x3; // gap - int sid = (message >> 6) & 0x3f; // service identifier - int gap_no[4] = {3, 5, 8, 11}; +// int G = (message >> 12) & 0x3; // gap +// int sid = (message >> 6) & 0x3f; // service identifier +// int gap_no[4] = {3, 5, 8, 11}; /* qDebug() << "RDSParser::decode_type3: gap: " << gap_no[G] << " groups, SID: " << sid << " ";*/ @@ -829,19 +823,19 @@ void RDSParser::decode_type4(unsigned int *group, bool B) //send_message(5,time); } -void RDSParser::decode_type5(unsigned int *group, bool B) { +void RDSParser::decode_type5(unsigned int *group __attribute__((unused)), bool B __attribute__((unused))) { qDebug() << "RDSParser::decode_type5: type5 not implemented yet"; m_g5_updated = true; m_g5_count++; } -void RDSParser::decode_type6(unsigned int *group, bool B) { +void RDSParser::decode_type6(unsigned int *group __attribute__((unused)), bool B __attribute__((unused))) { qDebug() << "RDSParser::decode_type6: type 6 not implemented yet"; m_g6_updated = true; m_g6_count++; } -void RDSParser::decode_type7(unsigned int *group, bool B) { +void RDSParser::decode_type7(unsigned int *group __attribute__((unused)), bool B __attribute__((unused))) { qDebug() << "RDSParser::decode_type7: type 7 not implemented yet"; m_g7_updated = true; m_g7_count++; @@ -969,25 +963,29 @@ void RDSParser::decode_type9(unsigned int *group, bool B){ m_g9_count++; } -void RDSParser::decode_type10(unsigned int *group, bool B){ +void RDSParser::decode_type10(unsigned int *group __attribute__((unused)), bool B __attribute__((unused))) +{ qDebug() << "RDSParser::decode_type10: type 10 not implemented yet"; m_g10_updated = true; m_g10_count++; } -void RDSParser::decode_type11(unsigned int *group, bool B){ +void RDSParser::decode_type11(unsigned int *group __attribute__((unused)), bool B __attribute__((unused))) +{ qDebug() << "RDSParser::decode_type11: type 11 not implemented yet"; m_g11_updated = true; m_g11_count++; } -void RDSParser::decode_type12(unsigned int *group, bool B){ +void RDSParser::decode_type12(unsigned int *group __attribute__((unused)), bool B __attribute__((unused))) +{ qDebug() << "RDSParser::decode_type12: type 12 not implemented yet"; m_g12_updated = true; m_g12_count++; } -void RDSParser::decode_type13(unsigned int *group, bool B){ +void RDSParser::decode_type13(unsigned int *group __attribute__((unused)), bool B __attribute__((unused))) +{ qDebug() << "RDSParser::decode_type13: type 13 not implemented yet"; m_g13_updated = true; m_g13_count++; @@ -995,14 +993,11 @@ void RDSParser::decode_type13(unsigned int *group, bool B){ void RDSParser::decode_type14(unsigned int *group, bool B) { - bool tp_on = (group[1] >> 4) & 0x01; char variant_code = group[1] & 0x0f; unsigned int information = group[2]; unsigned int pi_on = group[3]; - char pty_on = 0; bool ta_on = 0; - static char ps_on[8] = {' ',' ',' ',' ',' ',' ',' ',' '}; double af_1 = 0; double af_2 = 0; @@ -1144,7 +1139,6 @@ void RDSParser::decode_type14(unsigned int *group, bool B) case 13: // PTY(ON), TA(ON) { ta_on = information & 0x01; - pty_on = (information >> 11) & 0x1f; //qDebug() << "RDSParser::decode_type14: PTY(ON):" << pty_table[int(pty_on)].c_str(); if(ta_on) { qDebug() << "RDSParser::decode_type14: - TA"; @@ -1178,7 +1172,8 @@ void RDSParser::decode_type14(unsigned int *group, bool B) }*/ } -void RDSParser::decode_type15(unsigned int *group, bool B){ +void RDSParser::decode_type15(unsigned int *group __attribute__((unused)), bool B __attribute__((unused))) +{ qDebug() << "RDSParser::decode_type5: type 15 not implemented yet"; m_g15_updated = true; m_g15_count++; diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp index 274fba355..adc308ea5 100644 --- a/plugins/channelrx/demoddsd/dsddemod.cpp +++ b/plugins/channelrx/demoddsd/dsddemod.cpp @@ -34,14 +34,14 @@ DSDDemod::DSDDemod(BasebandSampleSink* sampleSink) : m_sampleCount(0), m_squelchCount(0), m_squelchOpen(false), + m_movingAverage(40, 0), + m_fmExcursion(24), m_audioFifo1(4, 48000), m_audioFifo2(4, 48000), - m_fmExcursion(24), - m_settingsMutex(QMutex::Recursive), m_scope(sampleSink), - m_scopeEnabled(true), - m_dsdDecoder(), - m_movingAverage(40, 0) + m_scopeEnabled(true), + m_dsdDecoder(), + m_settingsMutex(QMutex::Recursive) { setObjectName("DSDDemod"); @@ -122,7 +122,7 @@ void DSDDemod::configureMyPosition(MessageQueue* messageQueue, float myLatitude, messageQueue->push(cmd); } -void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst) +void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst __attribute__((unused))) { Complex ci; int samplesPerSymbol = m_dsdDecoder.getSamplesPerSymbol(); @@ -276,7 +276,7 @@ void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto if (nbAudioSamples > 0) { if (!m_running.m_audioMute) { - uint res = m_audioFifo1.write((const quint8*) dsdAudio, nbAudioSamples, 10); + m_audioFifo1.write((const quint8*) dsdAudio, nbAudioSamples, 10); } m_dsdDecoder.resetAudio1(); @@ -291,7 +291,7 @@ void DSDDemod::feed(const SampleVector::const_iterator& begin, const SampleVecto if (nbAudioSamples > 0) { if (!m_running.m_audioMute) { - uint res = m_audioFifo2.write((const quint8*) dsdAudio, nbAudioSamples, 10); + m_audioFifo2.write((const quint8*) dsdAudio, nbAudioSamples, 10); } m_dsdDecoder.resetAudio2(); diff --git a/plugins/channelrx/demoddsd/dsddemodgui.cpp b/plugins/channelrx/demoddsd/dsddemodgui.cpp index 4e6bd3e5a..adfc4ea40 100644 --- a/plugins/channelrx/demoddsd/dsddemodgui.cpp +++ b/plugins/channelrx/demoddsd/dsddemodgui.cpp @@ -128,7 +128,6 @@ bool DSDDemodGUI::deserialize(const QByteArray& data) QByteArray bytetmp; quint32 u32tmp; qint32 tmp; - bool boolTmp; blockApplySettings(true); m_channelMarker.blockSignals(true); @@ -177,7 +176,7 @@ bool DSDDemodGUI::deserialize(const QByteArray& data) } } -bool DSDDemodGUI::handleMessage(const Message& message) +bool DSDDemodGUI::handleMessage(const Message& message __attribute__((unused))) { return false; } @@ -199,22 +198,22 @@ void DSDDemodGUI::on_rfBW_valueChanged(int value) applySettings(); } -void DSDDemodGUI::on_demodGain_valueChanged(int value) +void DSDDemodGUI::on_demodGain_valueChanged(int value __attribute__((unused))) { applySettings(); } -void DSDDemodGUI::on_fmDeviation_valueChanged(int value) +void DSDDemodGUI::on_fmDeviation_valueChanged(int value __attribute__((unused))) { applySettings(); } -void DSDDemodGUI::on_volume_valueChanged(int value) +void DSDDemodGUI::on_volume_valueChanged(int value __attribute__((unused))) { applySettings(); } -void DSDDemodGUI::on_baudRate_currentIndexChanged(int index) +void DSDDemodGUI::on_baudRate_currentIndexChanged(int index __attribute__((unused))) { applySettings(); } @@ -249,7 +248,7 @@ void DSDDemodGUI::on_tdmaStereoSplit_toggled(bool checked) applySettings(); } -void DSDDemodGUI::on_squelchGate_valueChanged(int value) +void DSDDemodGUI::on_squelchGate_valueChanged(int value __attribute__((unused))) { applySettings(); } @@ -276,7 +275,7 @@ void DSDDemodGUI::on_symbolPLLLock_toggled(bool checked) applySettings(); } -void DSDDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void DSDDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { /* if((widget == ui->spectrumContainer) && (DSDDemodGUI != NULL)) diff --git a/plugins/channelrx/demoddsd/dsddemodplugin.cpp b/plugins/channelrx/demoddsd/dsddemodplugin.cpp index 8d0acbd58..f41e2223b 100644 --- a/plugins/channelrx/demoddsd/dsddemodplugin.cpp +++ b/plugins/channelrx/demoddsd/dsddemodplugin.cpp @@ -63,5 +63,5 @@ PluginGUI* DSDDemodPlugin::createRxChannel(const QString& channelName, DeviceSou void DSDDemodPlugin::createInstanceDSDDemod(DeviceSourceAPI *deviceAPI) { - DSDDemodGUI* gui = DSDDemodGUI::create(m_pluginAPI, deviceAPI); + DSDDemodGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channelrx/demodlora/lorademod.cpp b/plugins/channelrx/demodlora/lorademod.cpp index 937f080eb..a4c333703 100644 --- a/plugins/channelrx/demodlora/lorademod.cpp +++ b/plugins/channelrx/demodlora/lorademod.cpp @@ -236,7 +236,7 @@ int LoRaDemod::detect(Complex c, Complex a) return m_result; } -void LoRaDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool pO) +void LoRaDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool pO __attribute__((unused))) { int newangle; Complex ci; diff --git a/plugins/channelrx/demodlora/lorademodgui.cpp b/plugins/channelrx/demodlora/lorademodgui.cpp index d8c0c77b3..94d528c81 100644 --- a/plugins/channelrx/demodlora/lorademodgui.cpp +++ b/plugins/channelrx/demodlora/lorademodgui.cpp @@ -111,7 +111,7 @@ bool LoRaDemodGUI::deserialize(const QByteArray& data) } } -bool LoRaDemodGUI::handleMessage(const Message& message) +bool LoRaDemodGUI::handleMessage(const Message& message __attribute__((unused))) { return false; } @@ -130,11 +130,11 @@ void LoRaDemodGUI::on_BW_valueChanged(int value) applySettings(); } -void LoRaDemodGUI::on_Spread_valueChanged(int value) +void LoRaDemodGUI::on_Spread_valueChanged(int value __attribute__((unused))) { } -void LoRaDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void LoRaDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { /* if((widget == ui->spectrumContainer) && (m_LoRaDemod != NULL)) diff --git a/plugins/channelrx/demodlora/loraplugin.cpp b/plugins/channelrx/demodlora/loraplugin.cpp index e52be51b6..3139b9570 100644 --- a/plugins/channelrx/demodlora/loraplugin.cpp +++ b/plugins/channelrx/demodlora/loraplugin.cpp @@ -46,5 +46,5 @@ PluginGUI* LoRaPlugin::createRxChannel(const QString& channelName, DeviceSourceA void LoRaPlugin::createInstanceLoRa(DeviceSourceAPI *deviceAPI) { - LoRaDemodGUI* gui = LoRaDemodGUI::create(m_pluginAPI, deviceAPI); + LoRaDemodGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp index 3700fc99c..d377c23a5 100644 --- a/plugins/channelrx/demodnfm/nfmdemod.cpp +++ b/plugins/channelrx/demodnfm/nfmdemod.cpp @@ -43,12 +43,12 @@ NFMDemod::NFMDemod() : m_magsqSum(0.0f), m_magsqPeak(0.0f), m_magsqCount(0), - m_afSquelch(2, afSqTones), - m_audioFifo(4, 48000), - m_fmExcursion(2400), - m_settingsMutex(QMutex::Recursive), m_AGC(40, 0), - m_movingAverage(40, 0) + m_movingAverage(40, 0), + m_afSquelch(2, afSqTones), + m_fmExcursion(2400), + m_audioFifo(4, 48000), + m_settingsMutex(QMutex::Recursive) { setObjectName("NFMDemod"); @@ -138,7 +138,7 @@ Real angleDist(Real a, Real b) return dist; } -void NFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst) +void NFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst __attribute__((unused))) { Complex ci; diff --git a/plugins/channelrx/demodnfm/nfmdemodgui.cpp b/plugins/channelrx/demodnfm/nfmdemodgui.cpp index 066fdb763..50ca8b755 100644 --- a/plugins/channelrx/demodnfm/nfmdemodgui.cpp +++ b/plugins/channelrx/demodnfm/nfmdemodgui.cpp @@ -153,7 +153,7 @@ bool NFMDemodGUI::deserialize(const QByteArray& data) } } -bool NFMDemodGUI::handleMessage(const Message& message) +bool NFMDemodGUI::handleMessage(const Message& message __attribute__((unused))) { return false; } @@ -188,13 +188,13 @@ void NFMDemodGUI::on_volume_valueChanged(int value) applySettings(); } -void NFMDemodGUI::on_squelchGate_valueChanged(int value) +void NFMDemodGUI::on_squelchGate_valueChanged(int value __attribute__((unused))) { ui->squelchGateText->setText(QString("%1").arg(ui->squelchGate->value() * 10.0f, 0, 'f', 0)); applySettings(); } -void NFMDemodGUI::on_deltaSquelch_toggled(bool checked) +void NFMDemodGUI::on_deltaSquelch_toggled(bool checked __attribute__((unused))) { if (ui->deltaSquelch->isChecked()) { @@ -246,7 +246,7 @@ void NFMDemodGUI::on_ctcss_currentIndexChanged(int index) } } -void NFMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void NFMDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { /* if((widget == ui->spectrumContainer) && (m_nfmDemod != NULL)) diff --git a/plugins/channelrx/demodnfm/nfmplugin.cpp b/plugins/channelrx/demodnfm/nfmplugin.cpp index 9d486f0e7..443a768da 100644 --- a/plugins/channelrx/demodnfm/nfmplugin.cpp +++ b/plugins/channelrx/demodnfm/nfmplugin.cpp @@ -45,5 +45,5 @@ PluginGUI* NFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAP void NFMPlugin::createInstanceNFM(DeviceSourceAPI *deviceAPI) { - NFMDemodGUI* gui = NFMDemodGUI::create(m_pluginAPI, deviceAPI); + NFMDemodGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channelrx/demodssb/ssbdemod.cpp b/plugins/channelrx/demodssb/ssbdemod.cpp index ead3a5b17..e2d594af4 100644 --- a/plugins/channelrx/demodssb/ssbdemod.cpp +++ b/plugins/channelrx/demodssb/ssbdemod.cpp @@ -28,13 +28,13 @@ MESSAGE_CLASS_DEFINITION(SSBDemod::MsgConfigureSSBDemod, Message) SSBDemod::SSBDemod(BasebandSampleSink* sampleSink) : - m_sampleSink(sampleSink), - m_audioFifo(4, 24000), - m_settingsMutex(QMutex::Recursive), m_audioBinaual(false), m_audioFlipChannels(false), - m_audioMute(false), - m_dsb(false) + m_dsb(false), + m_audioMute(false), + m_sampleSink(sampleSink), + m_audioFifo(4, 24000), + m_settingsMutex(QMutex::Recursive) { setObjectName("SSBDemod"); @@ -89,11 +89,10 @@ void SSBDemod::configure(MessageQueue* messageQueue, messageQueue->push(cmd); } -void SSBDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly) +void SSBDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused))) { Complex ci; fftfilt::cmplx *sideband; - Real avg; int n_out; m_settingsMutex.lock(); diff --git a/plugins/channelrx/demodssb/ssbdemodgui.cpp b/plugins/channelrx/demodssb/ssbdemodgui.cpp index 7d3a077a2..38d09ae1e 100644 --- a/plugins/channelrx/demodssb/ssbdemodgui.cpp +++ b/plugins/channelrx/demodssb/ssbdemodgui.cpp @@ -136,7 +136,7 @@ bool SSBDemodGUI::deserialize(const QByteArray& data) } } -bool SSBDemodGUI::handleMessage(const Message& message) +bool SSBDemodGUI::handleMessage(const Message& message __attribute__((unused))) { return false; } @@ -283,7 +283,7 @@ void SSBDemodGUI::on_spanLog2_valueChanged(int value) } -void SSBDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void SSBDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { /* if((widget == ui->spectrumContainer) && (m_ssbDemod != NULL)) @@ -313,8 +313,8 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidg m_spanLog2(3), m_audioBinaural(false), m_audioFlipChannels(false), - m_audioMute(false), m_dsb(false), + m_audioMute(false), m_channelPowerDbAvg(20,0) { ui->setupUi(this); diff --git a/plugins/channelrx/demodssb/ssbplugin.cpp b/plugins/channelrx/demodssb/ssbplugin.cpp index cbc3963a1..812f94108 100644 --- a/plugins/channelrx/demodssb/ssbplugin.cpp +++ b/plugins/channelrx/demodssb/ssbplugin.cpp @@ -46,5 +46,5 @@ PluginGUI* SSBPlugin::createRxChannel(const QString& channelName, DeviceSourceAP void SSBPlugin::createInstanceSSB(DeviceSourceAPI *deviceAPI) { - SSBDemodGUI* gui = SSBDemodGUI::create(m_pluginAPI, deviceAPI); + SSBDemodGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channelrx/demodwfm/wfmdemod.cpp b/plugins/channelrx/demodwfm/wfmdemod.cpp index cb364cb56..5dd1a936a 100644 --- a/plugins/channelrx/demodwfm/wfmdemod.cpp +++ b/plugins/channelrx/demodwfm/wfmdemod.cpp @@ -29,15 +29,15 @@ MESSAGE_CLASS_DEFINITION(WFMDemod::MsgConfigureWFMDemod, Message) WFMDemod::WFMDemod(BasebandSampleSink* sampleSink) : - m_sampleSink(sampleSink), - m_audioFifo(4, 250000), - m_settingsMutex(QMutex::Recursive), m_squelchOpen(false), m_magsq(0.0f), m_magsqSum(0.0f), m_magsqPeak(0.0f), m_magsqCount(0), - m_movingAverage(40, 0) + m_movingAverage(40, 0), + m_sampleSink(sampleSink), + m_audioFifo(4, 250000), + m_settingsMutex(QMutex::Recursive) { setObjectName("WFMDemod"); @@ -84,7 +84,7 @@ void WFMDemod::configure( messageQueue->push(cmd); } -void WFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst) +void WFMDemod::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool firstOfBurst __attribute__((unused))) { Complex ci; fftfilt::cmplx *rf; diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.cpp b/plugins/channelrx/demodwfm/wfmdemodgui.cpp index b21346729..8bd8b3789 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.cpp +++ b/plugins/channelrx/demodwfm/wfmdemodgui.cpp @@ -135,7 +135,7 @@ bool WFMDemodGUI::deserialize(const QByteArray& data) } } -bool WFMDemodGUI::handleMessage(const Message& message) +bool WFMDemodGUI::handleMessage(const Message& message __attribute__((unused))) { return false; } @@ -180,7 +180,7 @@ void WFMDemodGUI::on_audioMute_toggled(bool checked) applySettings(); } -void WFMDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void WFMDemodGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { } diff --git a/plugins/channelrx/demodwfm/wfmplugin.cpp b/plugins/channelrx/demodwfm/wfmplugin.cpp index cc6f4e7ac..aeb9c76fd 100644 --- a/plugins/channelrx/demodwfm/wfmplugin.cpp +++ b/plugins/channelrx/demodwfm/wfmplugin.cpp @@ -46,5 +46,5 @@ PluginGUI* WFMPlugin::createRxChannel(const QString& channelName, DeviceSourceAP void WFMPlugin::createInstanceWFM(DeviceSourceAPI *deviceAPI) { - WFMDemodGUI* gui = WFMDemodGUI::create(m_pluginAPI, deviceAPI); + WFMDemodGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channelrx/tcpsrc/tcpsrc.cpp b/plugins/channelrx/tcpsrc/tcpsrc.cpp index 43dc4a6f5..ac2b01b67 100644 --- a/plugins/channelrx/tcpsrc/tcpsrc.cpp +++ b/plugins/channelrx/tcpsrc/tcpsrc.cpp @@ -391,7 +391,7 @@ void TCPSrc::processDeconnection() } } -void TCPSrc::onTcpServerError(QAbstractSocket::SocketError socketError) +void TCPSrc::onTcpServerError(QAbstractSocket::SocketError socketError __attribute__((unused))) { qDebug("TCPSrc::onTcpServerError: %s", qPrintable(m_tcpServer->errorString())); } diff --git a/plugins/channelrx/tcpsrc/tcpsrcgui.cpp b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp index 4f80f37f5..1dfbbcc81 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcgui.cpp +++ b/plugins/channelrx/tcpsrc/tcpsrcgui.cpp @@ -337,22 +337,22 @@ void TCPSrcGUI::on_deltaFrequency_changed(qint64 value) m_channelMarker.setCenterFrequency(value); } -void TCPSrcGUI::on_sampleFormat_currentIndexChanged(int index) +void TCPSrcGUI::on_sampleFormat_currentIndexChanged(int index __attribute__((unused))) { ui->applyBtn->setEnabled(true); } -void TCPSrcGUI::on_sampleRate_textEdited(const QString& arg1) +void TCPSrcGUI::on_sampleRate_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyBtn->setEnabled(true); } -void TCPSrcGUI::on_rfBandwidth_textEdited(const QString& arg1) +void TCPSrcGUI::on_rfBandwidth_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyBtn->setEnabled(true); } -void TCPSrcGUI::on_tcpPort_textEdited(const QString& arg1) +void TCPSrcGUI::on_tcpPort_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyBtn->setEnabled(true); } diff --git a/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp b/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp index 7e6859605..290e8b5af 100644 --- a/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp +++ b/plugins/channelrx/tcpsrc/tcpsrcplugin.cpp @@ -48,7 +48,7 @@ PluginGUI* TCPSrcPlugin::createRxChannel(const QString& channelName, DeviceSourc void TCPSrcPlugin::createInstanceTCPSrc(DeviceSourceAPI *deviceAPI) { - TCPSrcGUI* gui = TCPSrcGUI::create(m_pluginAPI, deviceAPI); + TCPSrcGUI::create(m_pluginAPI, deviceAPI); // deviceAPI->registerChannelInstance("sdrangel.channel.tcpsrc", gui); // m_pluginAPI->addChannelRollup(gui); } diff --git a/plugins/channelrx/udpsrc/udpsrc.cpp b/plugins/channelrx/udpsrc/udpsrc.cpp index 1a815d3ab..9ba62a754 100644 --- a/plugins/channelrx/udpsrc/udpsrc.cpp +++ b/plugins/channelrx/udpsrc/udpsrc.cpp @@ -29,13 +29,13 @@ MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcConfigureImmediate, Message) MESSAGE_CLASS_DEFINITION(UDPSrc::MsgUDPSrcSpectrum, Message) UDPSrc::UDPSrc(MessageQueue* uiMessageQueue, UDPSrcGUI* udpSrcGUI, BasebandSampleSink* spectrum) : - m_settingsMutex(QMutex::Recursive), m_udpPort(9999), - m_audioFifo(4, 24000), m_audioActive(false), m_audioStereo(false), m_volume(20), - m_fmDeviation(2500) + m_fmDeviation(2500), + m_audioFifo(4, 24000), + m_settingsMutex(QMutex::Recursive) { setObjectName("UDPSrc"); diff --git a/plugins/channelrx/udpsrc/udpsrc.h b/plugins/channelrx/udpsrc/udpsrc.h index 369db610d..699258234 100644 --- a/plugins/channelrx/udpsrc/udpsrc.h +++ b/plugins/channelrx/udpsrc/udpsrc.h @@ -177,10 +177,10 @@ protected: int boost, int volume) : Message(), + m_boost(boost), + m_volume(volume), m_audioActive(audioActive), - m_audioStereo(audioStereo), - m_boost(boost), - m_volume(volume) + m_audioStereo(audioStereo) { } }; diff --git a/plugins/channelrx/udpsrc/udpsrcgui.cpp b/plugins/channelrx/udpsrc/udpsrcgui.cpp index 1da030d4c..04a835cb9 100644 --- a/plugins/channelrx/udpsrc/udpsrcgui.cpp +++ b/plugins/channelrx/udpsrc/udpsrcgui.cpp @@ -202,7 +202,7 @@ bool UDPSrcGUI::deserialize(const QByteArray& data) } } -bool UDPSrcGUI::handleMessage(const Message& message) +bool UDPSrcGUI::handleMessage(const Message& message __attribute__((unused))) { qDebug() << "UDPSrcGUI::handleMessage"; return false; @@ -228,10 +228,10 @@ UDPSrcGUI::UDPSrcGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* m_udpSrc(0), m_channelMarker(this), m_channelPowerDbAvg(40,0), - m_basicSettingsShown(false), - m_doApplySettings(true), m_boost(1), - m_volume(20) + m_volume(20), + m_basicSettingsShown(false), + m_doApplySettings(true) { ui->setupUi(this); connect(this, SIGNAL(widgetRolled(QWidget*,bool)), this, SLOT(onWidgetRolled(QWidget*,bool))); @@ -454,32 +454,32 @@ void UDPSrcGUI::on_sampleFormat_currentIndexChanged(int index) ui->applyBtn->setEnabled(true); } -void UDPSrcGUI::on_sampleRate_textEdited(const QString& arg1) +void UDPSrcGUI::on_sampleRate_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyBtn->setEnabled(true); } -void UDPSrcGUI::on_rfBandwidth_textEdited(const QString& arg1) +void UDPSrcGUI::on_rfBandwidth_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyBtn->setEnabled(true); } -void UDPSrcGUI::on_fmDeviation_textEdited(const QString& arg1) +void UDPSrcGUI::on_fmDeviation_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyBtn->setEnabled(true); } -void UDPSrcGUI::on_udpAddress_textEdited(const QString& arg1) +void UDPSrcGUI::on_udpAddress_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyBtn->setEnabled(true); } -void UDPSrcGUI::on_udpPort_textEdited(const QString& arg1) +void UDPSrcGUI::on_udpPort_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyBtn->setEnabled(true); } -void UDPSrcGUI::on_audioPort_textEdited(const QString& arg1) +void UDPSrcGUI::on_audioPort_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyBtn->setEnabled(true); } @@ -489,12 +489,12 @@ void UDPSrcGUI::on_applyBtn_clicked() applySettings(); } -void UDPSrcGUI::on_audioActive_toggled(bool active) +void UDPSrcGUI::on_audioActive_toggled(bool active __attribute__((unused))) { applySettingsImmediate(); } -void UDPSrcGUI::on_audioStereo_toggled(bool stereo) +void UDPSrcGUI::on_audioStereo_toggled(bool stereo __attribute__((unused))) { applySettingsImmediate(); } diff --git a/plugins/channelrx/udpsrc/udpsrcplugin.cpp b/plugins/channelrx/udpsrc/udpsrcplugin.cpp index 2d8b9b5a0..ee6a35c93 100644 --- a/plugins/channelrx/udpsrc/udpsrcplugin.cpp +++ b/plugins/channelrx/udpsrc/udpsrcplugin.cpp @@ -65,7 +65,7 @@ PluginGUI* UDPSrcPlugin::createRxChannel(const QString& channelName, DeviceSourc void UDPSrcPlugin::createInstanceUDPSrc(DeviceSourceAPI *deviceAPI) { - UDPSrcGUI* gui = UDPSrcGUI::create(m_pluginAPI, deviceAPI); + UDPSrcGUI::create(m_pluginAPI, deviceAPI); // deviceAPI->registerChannelInstance("sdrangel.channel.udpsrc", gui); // m_pluginAPI->addChannelRollup(gui); } diff --git a/plugins/channeltx/modam/ammod.cpp b/plugins/channeltx/modam/ammod.cpp index 297e0f75d..f610467df 100644 --- a/plugins/channeltx/modam/ammod.cpp +++ b/plugins/channeltx/modam/ammod.cpp @@ -36,6 +36,8 @@ MESSAGE_CLASS_DEFINITION(AMMod::MsgReportFileSourceStreamTiming, Message) const int AMMod::m_levelNbSamples = 480; // every 10ms AMMod::AMMod() : + m_movingAverage(40, 0), + m_volumeAGC(40, 0), m_audioFifo(4, 48000), m_settingsMutex(QMutex::Recursive), m_fileSize(0), @@ -44,9 +46,7 @@ AMMod::AMMod() : m_afInput(AMModInputNone), m_levelCalcCount(0), m_peakLevel(0.0f), - m_levelSum(0.0f), - m_movingAverage(40, 0), - m_volumeAGC(40, 0) + m_levelSum(0.0f) { setObjectName("AMMod"); @@ -141,7 +141,7 @@ void AMMod::pull(Sample& sample) void AMMod::pullAudio(int nbSamples) { // qDebug("AMMod::pullAudio: %d", nbSamples); - int nbAudioSamples = nbSamples * m_interpolatorDistance; + unsigned int nbAudioSamples = nbSamples * m_interpolatorDistance; if (nbAudioSamples > m_audioBuffer.size()) { diff --git a/plugins/channeltx/modam/ammodgui.cpp b/plugins/channeltx/modam/ammodgui.cpp index d9e399bcb..f002df397 100644 --- a/plugins/channeltx/modam/ammodgui.cpp +++ b/plugins/channeltx/modam/ammodgui.cpp @@ -218,12 +218,12 @@ void AMModGUI::on_toneFrequency_valueChanged(int value) } -void AMModGUI::on_channelMute_toggled(bool checked) +void AMModGUI::on_channelMute_toggled(bool checked __attribute__((unused))) { applySettings(); } -void AMModGUI::on_playLoop_toggled(bool checked) +void AMModGUI::on_playLoop_toggled(bool checked __attribute__((unused))) { applySettings(); } @@ -283,7 +283,7 @@ void AMModGUI::on_navTimeSlider_valueChanged(int value) } } -void AMModGUI::on_showFileDialog_clicked(bool checked) +void AMModGUI::on_showFileDialog_clicked(bool checked __attribute__((unused))) { QString fileName = QFileDialog::getOpenFileName(this, tr("Open raw audio file"), ".", tr("Raw audio Files (*.raw)")); @@ -304,7 +304,7 @@ void AMModGUI::configureFileName() m_amMod->getInputMessageQueue()->push(message); } -void AMModGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void AMModGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { } diff --git a/plugins/channeltx/modam/ammodplugin.cpp b/plugins/channeltx/modam/ammodplugin.cpp index e0f69b52f..13f3d4258 100644 --- a/plugins/channeltx/modam/ammodplugin.cpp +++ b/plugins/channeltx/modam/ammodplugin.cpp @@ -62,5 +62,5 @@ PluginGUI* AMModPlugin::createTxChannel(const QString& channelName, DeviceSinkAP void AMModPlugin::createInstanceModAM(DeviceSinkAPI *deviceAPI) { - AMModGUI* gui = AMModGUI::create(m_pluginAPI, deviceAPI); + AMModGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channeltx/modatv/atvmod.cpp b/plugins/channeltx/modatv/atvmod.cpp index beed56c99..046b9a967 100644 --- a/plugins/channeltx/modatv/atvmod.cpp +++ b/plugins/channeltx/modatv/atvmod.cpp @@ -45,11 +45,12 @@ const int ATVMod::m_ssbFftLen = 1024; ATVMod::ATVMod() : m_modPhasor(0.0f), - m_evenImage(true), m_tvSampleRate(1000000), + m_evenImage(true), m_settingsMutex(QMutex::Recursive), m_horizontalCount(0), m_lineCount(0), + m_movingAverage(40, 0), m_imageOK(false), m_videoFPSq(1.0f), m_videoFPSCount(0.0f), @@ -59,12 +60,11 @@ ATVMod::ATVMod() : m_cameraIndex(-1), m_showOverlayText(false), m_SSBFilter(0), - m_DSBFilter(0), m_SSBFilterBuffer(0), - m_DSBFilterBuffer(0), m_SSBFilterBufferIndex(0), - m_DSBFilterBufferIndex(0), - m_movingAverage(40, 0) + m_DSBFilter(0), + m_DSBFilterBuffer(0), + m_DSBFilterBufferIndex(0) { setObjectName("ATVMod"); scanCameras(); @@ -137,7 +137,7 @@ void ATVMod::configure(MessageQueue* messageQueue, messageQueue->push(cmd); } -void ATVMod::pullAudio(int nbSamples) +void ATVMod::pullAudio(int nbSamples __attribute__((unused))) { } @@ -329,7 +329,7 @@ void ATVMod::pullVideo(Real& sample) if ((m_running.m_atvModInput == ATVModInputVideo) && m_videoOK && (m_running.m_videoPlay) && !m_videoEOF) { - int grabOK; + int grabOK = 0; int fpsIncrement = (int) m_videoFPSCount - m_videoPrevFPSCount; // move a number of frames according to increment @@ -610,7 +610,7 @@ bool ATVMod::handleMessage(const Message& cmd) else if (MsgConfigureCameraIndex::match(cmd)) { MsgConfigureCameraIndex& cfg = (MsgConfigureCameraIndex&) cmd; - int index = cfg.getIndex(); + uint32_t index = cfg.getIndex() & 0x7FFFFFF; if (index < m_cameras.size()) { @@ -632,7 +632,7 @@ bool ATVMod::handleMessage(const Message& cmd) else if (MsgConfigureCameraData::match(cmd)) { MsgConfigureCameraData& cfg = (MsgConfigureCameraData&) cmd; - int index = cfg.getIndex(); + uint32_t index = cfg.getIndex() & 0x7FFFFFF; float mnaualFPS = cfg.getManualFPS(); bool manualFPSEnable = cfg.getManualFPSEnable(); @@ -1134,7 +1134,7 @@ void ATVMod::mixImageAndText(cv::Mat& image) int thickness = image.cols / 160; int baseline=0; - fontScale < 8.0f ? 8.0f : fontScale; // minimum size + fontScale = fontScale < 8.0f ? 8.0f : fontScale; // minimum size cv::Size textSize = cv::getTextSize(m_overlayText, fontFace, fontScale, thickness, &baseline); baseline += thickness; diff --git a/plugins/channeltx/modatv/atvmod.h b/plugins/channeltx/modatv/atvmod.h index e014669ce..977d2b058 100644 --- a/plugins/channeltx/modatv/atvmod.h +++ b/plugins/channeltx/modatv/atvmod.h @@ -621,27 +621,27 @@ private: Real m_interpolatorDistanceRemain; int m_tvSampleRate; //!< sample rate for generating signal uint32_t m_pointsPerLine; //!< Number of points per full line - uint32_t m_pointsPerSync; //!< number of line points for the horizontal sync - uint32_t m_pointsPerBP; //!< number of line points for the back porch - uint32_t m_pointsPerImgLine; //!< number of line points for the image line + int m_pointsPerSync; //!< number of line points for the horizontal sync + int m_pointsPerBP; //!< number of line points for the back porch + int m_pointsPerImgLine; //!< number of line points for the image line uint32_t m_pointsPerFP; //!< number of line points for the front porch - uint32_t m_pointsPerFSync; //!< number of line points for the field first sync + int m_pointsPerFSync; //!< number of line points for the field first sync uint32_t m_pointsPerHBar; //!< number of line points for a bar of the bar chart uint32_t m_linesPerVBar; //!< number of lines for a bar of the bar chart uint32_t m_pointsPerTU; //!< number of line points per time unit - uint32_t m_nbLines; //!< number of lines per complete frame - uint32_t m_nbLines2; //!< same number as above (non interlaced) or half the number above (interlaced) + int m_nbLines; //!< number of lines per complete frame + int m_nbLines2; //!< same number as above (non interlaced) or half the number above (interlaced) uint32_t m_nbImageLines; //!< number of image lines excluding synchronization lines uint32_t m_nbImageLines2; //!< same number as above (non interlaced) or half the number above (interlaced) - uint32_t m_nbHorizPoints; //!< number of line points per horizontal line - uint32_t m_nbSyncLinesHeadE; //!< number of header sync lines on even frame - uint32_t m_nbSyncLinesHeadO; //!< number of header sync lines on odd frame - uint32_t m_nbSyncLinesBottom;//!< number of sync lines at bottom - uint32_t m_nbLongSyncLines; //!< number of whole long sync lines for vertical synchronization - uint32_t m_nbHalfLongSync; //!< number of half long sync / equalization lines - uint32_t m_nbWholeEqLines; //!< number of whole equalizing lines + int m_nbHorizPoints; //!< number of line points per horizontal line + int m_nbSyncLinesHeadE; //!< number of header sync lines on even frame + int m_nbSyncLinesHeadO; //!< number of header sync lines on odd frame + int m_nbSyncLinesBottom;//!< number of sync lines at bottom + int m_nbLongSyncLines; //!< number of whole long sync lines for vertical synchronization + int m_nbHalfLongSync; //!< number of half long sync / equalization lines + int m_nbWholeEqLines; //!< number of whole equalizing lines bool m_singleLongSync; //!< single or double long sync per long sync line - uint32_t m_nbBlankLines; //!< number of lines in a frame (full or half) that are blanked (black) at the top of the image + int m_nbBlankLines; //!< number of lines in a frame (full or half) that are blanked (black) at the top of the image float m_blankLineLvel; //!< video level of blank lines float m_hBarIncrement; //!< video level increment at each horizontal bar increment float m_vBarIncrement; //!< video level increment at each vertical bar increment diff --git a/plugins/channeltx/modatv/atvmodgui.cpp b/plugins/channeltx/modatv/atvmodgui.cpp index a6891d0e6..46398b4a8 100644 --- a/plugins/channeltx/modatv/atvmodgui.cpp +++ b/plugins/channeltx/modatv/atvmodgui.cpp @@ -377,7 +377,7 @@ void ATVModGUI::on_deltaFrequency_changed(qint64 value) m_channelMarker.setCenterFrequency(value); } -void ATVModGUI::on_modulation_currentIndexChanged(int index) +void ATVModGUI::on_modulation_currentIndexChanged(int index __attribute__((unused))) { setRFFiltersSlidersRange(m_atvMod->getEffectiveSampleRate()); setChannelMarkerBandwidth(); @@ -441,18 +441,18 @@ void ATVModGUI::setChannelMarkerBandwidth() } } -void ATVModGUI::on_nbLines_currentIndexChanged(int index) +void ATVModGUI::on_nbLines_currentIndexChanged(int index __attribute__((unused))) { applySettings(); } -void ATVModGUI::on_fps_currentIndexChanged(int index) +void ATVModGUI::on_fps_currentIndexChanged(int index __attribute__((unused))) { applySettings(); } -void ATVModGUI::on_standard_currentIndexChanged(int index) +void ATVModGUI::on_standard_currentIndexChanged(int index __attribute__((unused))) { applySettings(); } @@ -468,22 +468,22 @@ void ATVModGUI::on_invertVideo_clicked() applySettings(); } -void ATVModGUI::on_inputSelect_currentIndexChanged(int index) +void ATVModGUI::on_inputSelect_currentIndexChanged(int index __attribute__((unused))) { applySettings(); } -void ATVModGUI::on_channelMute_toggled(bool checked) +void ATVModGUI::on_channelMute_toggled(bool checked __attribute__((unused))) { applySettings(); } -void ATVModGUI::on_forceDecimator_toggled(bool checked) +void ATVModGUI::on_forceDecimator_toggled(bool checked __attribute__((unused))) { applySettings(); } -void ATVModGUI::on_imageFileDialog_clicked(bool checked) +void ATVModGUI::on_imageFileDialog_clicked(bool checked __attribute__((unused))) { QString fileName = QFileDialog::getOpenFileName(this, tr("Open image file"), ".", tr("Image Files (*.png *.jpg *.bmp *.gif *.tiff)")); @@ -496,7 +496,7 @@ void ATVModGUI::on_imageFileDialog_clicked(bool checked) } } -void ATVModGUI::on_videoFileDialog_clicked(bool checked) +void ATVModGUI::on_videoFileDialog_clicked(bool checked __attribute__((unused))) { QString fileName = QFileDialog::getOpenFileName(this, tr("Open video file"), ".", tr("Video Files (*.avi *.mpg *.mp4 *.mov *.m4v *.mkv *.vob *.wmv)")); @@ -509,7 +509,7 @@ void ATVModGUI::on_videoFileDialog_clicked(bool checked) } } -void ATVModGUI::on_playLoop_toggled(bool checked) +void ATVModGUI::on_playLoop_toggled(bool checked __attribute__((unused))) { applySettings(); } @@ -525,13 +525,12 @@ void ATVModGUI::on_navTimeSlider_valueChanged(int value) { if (m_enableNavTime && ((value >= 0) && (value <= 100))) { - int seekFame = (m_videoLength * value) / 100; ATVMod::MsgConfigureVideoFileSourceSeek* message = ATVMod::MsgConfigureVideoFileSourceSeek::create(value); m_atvMod->getInputMessageQueue()->push(message); } } -void ATVModGUI::on_playCamera_toggled(bool checked) +void ATVModGUI::on_playCamera_toggled(bool checked __attribute__((unused))) { applySettings(); } @@ -567,7 +566,7 @@ void ATVModGUI::on_overlayTextShow_toggled(bool checked) m_atvMod->getInputMessageQueue()->push(message); } -void ATVModGUI::on_overlayText_textEdited(const QString& arg1) +void ATVModGUI::on_overlayText_textEdited(const QString& arg1 __attribute__((unused))) { ATVMod::MsgConfigureOverlayText* message = ATVMod::MsgConfigureOverlayText::create(ui->overlayText->text()); m_atvMod->getInputMessageQueue()->push(message); @@ -587,7 +586,7 @@ void ATVModGUI::configureVideoFileName() m_atvMod->getInputMessageQueue()->push(message); } -void ATVModGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void ATVModGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { } diff --git a/plugins/channeltx/modatv/atvmodplugin.cpp b/plugins/channeltx/modatv/atvmodplugin.cpp index b34f7fcfd..67a2c5a3d 100644 --- a/plugins/channeltx/modatv/atvmodplugin.cpp +++ b/plugins/channeltx/modatv/atvmodplugin.cpp @@ -62,7 +62,7 @@ PluginGUI* ATVModPlugin::createTxChannel(const QString& channelName, DeviceSinkA void ATVModPlugin::createInstanceModATV(DeviceSinkAPI *deviceAPI) { - ATVModGUI* gui = ATVModGUI::create(m_pluginAPI, deviceAPI); + ATVModGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channeltx/modnfm/nfmmod.cpp b/plugins/channeltx/modnfm/nfmmod.cpp index 4987e3f68..7a9b4c61f 100644 --- a/plugins/channeltx/modnfm/nfmmod.cpp +++ b/plugins/channeltx/modnfm/nfmmod.cpp @@ -37,6 +37,8 @@ const int NFMMod::m_levelNbSamples = 480; // every 10ms NFMMod::NFMMod() : m_modPhasor(0.0f), + m_movingAverage(40, 0), + m_volumeAGC(40, 0), m_audioFifo(4, 48000), m_settingsMutex(QMutex::Recursive), m_fileSize(0), @@ -45,9 +47,7 @@ NFMMod::NFMMod() : m_afInput(NFMModInputNone), m_levelCalcCount(0), m_peakLevel(0.0f), - m_levelSum(0.0f), - m_movingAverage(40, 0), - m_volumeAGC(40, 0) + m_levelSum(0.0f) { setObjectName("NFMod"); @@ -117,7 +117,6 @@ void NFMMod::pull(Sample& sample) } Complex ci; - Real t; m_settingsMutex.lock(); @@ -155,7 +154,7 @@ void NFMMod::pull(Sample& sample) void NFMMod::pullAudio(int nbSamples) { - int nbSamplesAudio = nbSamples * m_interpolatorDistance; + unsigned int nbSamplesAudio = nbSamples * m_interpolatorDistance; if (nbSamplesAudio > m_audioBuffer.size()) { diff --git a/plugins/channeltx/modnfm/nfmmodgui.cpp b/plugins/channeltx/modnfm/nfmmodgui.cpp index 57c1acee7..54f845940 100644 --- a/plugins/channeltx/modnfm/nfmmodgui.cpp +++ b/plugins/channeltx/modnfm/nfmmodgui.cpp @@ -246,12 +246,12 @@ void NFMModGUI::on_toneFrequency_valueChanged(int value) applySettings(); } -void NFMModGUI::on_channelMute_toggled(bool checked) +void NFMModGUI::on_channelMute_toggled(bool checked __attribute__((unused))) { applySettings(); } -void NFMModGUI::on_playLoop_toggled(bool checked) +void NFMModGUI::on_playLoop_toggled(bool checked __attribute__((unused))) { applySettings(); } @@ -311,7 +311,7 @@ void NFMModGUI::on_navTimeSlider_valueChanged(int value) } } -void NFMModGUI::on_showFileDialog_clicked(bool checked) +void NFMModGUI::on_showFileDialog_clicked(bool checked __attribute__((unused))) { QString fileName = QFileDialog::getOpenFileName(this, tr("Open raw audio file"), ".", tr("Raw audio Files (*.raw)")); @@ -325,12 +325,12 @@ void NFMModGUI::on_showFileDialog_clicked(bool checked) } } -void NFMModGUI::on_ctcss_currentIndexChanged(int index) +void NFMModGUI::on_ctcss_currentIndexChanged(int index __attribute__((unused))) { applySettings(); } -void NFMModGUI::on_ctcssOn_toggled(bool checked) +void NFMModGUI::on_ctcssOn_toggled(bool checked __attribute__((unused))) { applySettings(); } @@ -343,7 +343,7 @@ void NFMModGUI::configureFileName() m_nfmMod->getInputMessageQueue()->push(message); } -void NFMModGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void NFMModGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { } diff --git a/plugins/channeltx/modnfm/nfmmodplugin.cpp b/plugins/channeltx/modnfm/nfmmodplugin.cpp index 6b3ffb914..7e9ae6ce3 100644 --- a/plugins/channeltx/modnfm/nfmmodplugin.cpp +++ b/plugins/channeltx/modnfm/nfmmodplugin.cpp @@ -62,5 +62,5 @@ PluginGUI* NFMModPlugin::createTxChannel(const QString& channelName, DeviceSinkA void NFMModPlugin::createInstanceModNFM(DeviceSinkAPI *deviceAPI) { - NFMModGUI* gui = NFMModGUI::create(m_pluginAPI, deviceAPI); + NFMModGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channeltx/modssb/ssbmod.cpp b/plugins/channeltx/modssb/ssbmod.cpp index 88a222f84..002cd2b15 100644 --- a/plugins/channeltx/modssb/ssbmod.cpp +++ b/plugins/channeltx/modssb/ssbmod.cpp @@ -37,13 +37,15 @@ const int SSBMod::m_levelNbSamples = 480; // every 10ms const int SSBMod::m_ssbFftLen = 1024; SSBMod::SSBMod(BasebandSampleSink* sampleSink) : - m_sampleSink(sampleSink), m_SSBFilter(0), m_DSBFilter(0), m_SSBFilterBuffer(0), m_DSBFilterBuffer(0), m_SSBFilterBufferIndex(0), m_DSBFilterBufferIndex(0), + m_sampleSink(sampleSink), + m_movingAverage(40, 0), + m_volumeAGC(40, 0), m_audioFifo(4, 48000), m_settingsMutex(QMutex::Recursive), m_fileSize(0), @@ -52,9 +54,7 @@ SSBMod::SSBMod(BasebandSampleSink* sampleSink) : m_afInput(SSBModInputNone), m_levelCalcCount(0), m_peakLevel(0.0f), - m_levelSum(0.0f), - m_movingAverage(40, 0), - m_volumeAGC(40, 0) + m_levelSum(0.0f) { setObjectName("SSBMod"); @@ -186,7 +186,7 @@ void SSBMod::pull(Sample& sample) void SSBMod::pullAudio(int nbSamples) { - int nbSamplesAudio = nbSamples * m_interpolatorDistance; + unsigned int nbSamplesAudio = nbSamples * m_interpolatorDistance; if (nbSamplesAudio > m_audioBuffer.size()) { diff --git a/plugins/channeltx/modssb/ssbmodgui.cpp b/plugins/channeltx/modssb/ssbmodgui.cpp index 8f0480c0e..802c48875 100644 --- a/plugins/channeltx/modssb/ssbmodgui.cpp +++ b/plugins/channeltx/modssb/ssbmodgui.cpp @@ -249,12 +249,12 @@ void SSBModGUI::on_dsb_toggled(bool checked) setNewRate(m_spanLog2); } -void SSBModGUI::on_audioBinaural_toggled(bool checked) +void SSBModGUI::on_audioBinaural_toggled(bool checked __attribute__((unused))) { applySettings(); } -void SSBModGUI::on_audioFlipChannels_toggled(bool checked) +void SSBModGUI::on_audioFlipChannels_toggled(bool checked __attribute__((unused))) { applySettings(); } @@ -337,7 +337,7 @@ void SSBModGUI::on_audioMute_toggled(bool checked) applySettings(); } -void SSBModGUI::on_playLoop_toggled(bool checked) +void SSBModGUI::on_playLoop_toggled(bool checked __attribute__((unused))) { applySettings(); } @@ -397,7 +397,7 @@ void SSBModGUI::on_navTimeSlider_valueChanged(int value) } } -void SSBModGUI::on_showFileDialog_clicked(bool checked) +void SSBModGUI::on_showFileDialog_clicked(bool checked __attribute__((unused))) { QString fileName = QFileDialog::getOpenFileName(this, tr("Open raw audio file"), ".", tr("Raw audio Files (*.raw)")); @@ -418,7 +418,7 @@ void SSBModGUI::configureFileName() m_ssbMod->getInputMessageQueue()->push(message); } -void SSBModGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void SSBModGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { } diff --git a/plugins/channeltx/modssb/ssbmodplugin.cpp b/plugins/channeltx/modssb/ssbmodplugin.cpp index d7b3c6593..5ae81f73a 100644 --- a/plugins/channeltx/modssb/ssbmodplugin.cpp +++ b/plugins/channeltx/modssb/ssbmodplugin.cpp @@ -62,5 +62,5 @@ PluginGUI* SSBModPlugin::createTxChannel(const QString& channelName, DeviceSinkA void SSBModPlugin::createInstanceModSSB(DeviceSinkAPI *deviceAPI) { - SSBModGUI* gui = SSBModGUI::create(m_pluginAPI, deviceAPI); + SSBModGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/channeltx/modwfm/wfmmod.cpp b/plugins/channeltx/modwfm/wfmmod.cpp index f1bf1aaaf..61c3a0826 100644 --- a/plugins/channeltx/modwfm/wfmmod.cpp +++ b/plugins/channeltx/modwfm/wfmmod.cpp @@ -38,17 +38,17 @@ const int WFMMod::m_rfFilterFFTLength = 1024; WFMMod::WFMMod() : m_modPhasor(0.0f), + m_movingAverage(40, 0), + m_volumeAGC(40, 0), m_audioFifo(4, 48000), m_settingsMutex(QMutex::Recursive), - m_fileSize(0), + m_fileSize(0), m_recordLength(0), m_sampleRate(48000), m_afInput(WFMModInputNone), m_levelCalcCount(0), m_peakLevel(0.0f), - m_levelSum(0.0f), - m_movingAverage(40, 0), - m_volumeAGC(40, 0) + m_levelSum(0.0f) { setObjectName("WFMod"); @@ -117,7 +117,6 @@ void WFMMod::pull(Sample& sample) } Complex ci, ri; - Real t; fftfilt::cmplx *rf; int rf_out; @@ -169,7 +168,7 @@ void WFMMod::pull(Sample& sample) void WFMMod::pullAudio(int nbSamples) { - int nbSamplesAudio = nbSamples * m_interpolatorDistance; + unsigned int nbSamplesAudio = nbSamples * m_interpolatorDistance; if (nbSamplesAudio > m_audioBuffer.size()) { diff --git a/plugins/channeltx/modwfm/wfmmodgui.cpp b/plugins/channeltx/modwfm/wfmmodgui.cpp index f7fa249a8..684c79a7d 100644 --- a/plugins/channeltx/modwfm/wfmmodgui.cpp +++ b/plugins/channeltx/modwfm/wfmmodgui.cpp @@ -227,12 +227,12 @@ void WFMModGUI::on_toneFrequency_valueChanged(int value) applySettings(); } -void WFMModGUI::on_channelMute_toggled(bool checked) +void WFMModGUI::on_channelMute_toggled(bool checked __attribute__((unused))) { applySettings(); } -void WFMModGUI::on_playLoop_toggled(bool checked) +void WFMModGUI::on_playLoop_toggled(bool checked __attribute__((unused))) { applySettings(); } @@ -292,7 +292,7 @@ void WFMModGUI::on_navTimeSlider_valueChanged(int value) } } -void WFMModGUI::on_showFileDialog_clicked(bool checked) +void WFMModGUI::on_showFileDialog_clicked(bool checked __attribute__((unused))) { QString fileName = QFileDialog::getOpenFileName(this, tr("Open raw audio file"), ".", tr("Raw audio Files (*.raw)")); @@ -313,7 +313,7 @@ void WFMModGUI::configureFileName() m_wfmMod->getInputMessageQueue()->push(message); } -void WFMModGUI::onWidgetRolled(QWidget* widget, bool rollDown) +void WFMModGUI::onWidgetRolled(QWidget* widget __attribute__((unused)), bool rollDown __attribute__((unused))) { } diff --git a/plugins/channeltx/modwfm/wfmmodplugin.cpp b/plugins/channeltx/modwfm/wfmmodplugin.cpp index 9bd4b0fe2..8d6b58d83 100644 --- a/plugins/channeltx/modwfm/wfmmodplugin.cpp +++ b/plugins/channeltx/modwfm/wfmmodplugin.cpp @@ -62,5 +62,5 @@ PluginGUI* WFMModPlugin::createTxChannel(const QString& channelName, DeviceSinkA void WFMModPlugin::createInstanceModWFM(DeviceSinkAPI *deviceAPI) { - WFMModGUI* gui = WFMModGUI::create(m_pluginAPI, deviceAPI); + WFMModGUI::create(m_pluginAPI, deviceAPI); } diff --git a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp index 100a1e0e4..36d95f1d2 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutput.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutput.cpp @@ -311,7 +311,6 @@ bool BladerfOutput::applySettings(const BladeRFOutputSettings& settings, bool fo if (m_deviceAPI->getSourceBuddies().size() > 0) { DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[0]; - DeviceBladeRFParams *buddySharedParams = (DeviceBladeRFParams *) buddy->getBuddySharedPtr(); if (buddy->getDeviceSourceEngine()->state() == DSPDeviceSourceEngine::StRunning) // Tx side running { diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp index 71156c725..65ce17e70 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp @@ -49,7 +49,8 @@ BladerfOutputGui::BladerfOutputGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : ui->sampleRate->setValueRange(8, BLADERF_SAMPLERATE_MIN, BLADERF_SAMPLERATE_REC_MAX); ui->bandwidth->clear(); - for (int i = 0; i < BladerfBandwidths::getNbBandwidths(); i++) + + for (unsigned int i = 0; i < BladerfBandwidths::getNbBandwidths(); i++) { ui->bandwidth->addItem(QString::number(BladerfBandwidths::getBandwidth(i))); } diff --git a/plugins/samplesink/filesink/filesinkgui.cpp b/plugins/samplesink/filesink/filesinkgui.cpp index 2484e5ef0..cb6b1d13c 100644 --- a/plugins/samplesink/filesink/filesinkgui.cpp +++ b/plugins/samplesink/filesink/filesinkgui.cpp @@ -39,10 +39,10 @@ FileSinkGui::FileSinkGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : ui(new Ui::FileSinkGui), m_deviceAPI(deviceAPI), m_settings(), - m_deviceSampleSink(0), - m_sampleRate(0), - m_generation(false), m_fileName("./test.sdriq"), + m_deviceSampleSink(0), + m_sampleRate(0), + m_generation(false), m_startingTimeStamp(0), m_samplesCount(0), m_tickCount(0), @@ -285,7 +285,7 @@ void FileSinkGui::on_startStop_toggled(bool checked) } } -void FileSinkGui::on_showFileDialog_clicked(bool checked) +void FileSinkGui::on_showFileDialog_clicked(bool checked __attribute__((unused))) { QString fileName = QFileDialog::getSaveFileName(this, tr("Save I/Q record file"), ".", tr("SDR I/Q Files (*.sdriq)")); diff --git a/plugins/samplesink/filesink/filesinksettings.cpp b/plugins/samplesink/filesink/filesinksettings.cpp index 7974dc838..afefba560 100644 --- a/plugins/samplesink/filesink/filesinksettings.cpp +++ b/plugins/samplesink/filesink/filesinksettings.cpp @@ -51,7 +51,6 @@ bool FileSinkSettings::deserialize(const QByteArray& data) if (d.getVersion() == 1) { - int intval; d.readU64(1, &m_sampleRate, 48000); d.readU32(2, &m_log2Interp, 0); return true; diff --git a/plugins/samplesink/filesink/filesinkthread.cpp b/plugins/samplesink/filesink/filesinkthread.cpp index 315be243d..c41eedd93 100644 --- a/plugins/samplesink/filesink/filesinkthread.cpp +++ b/plugins/samplesink/filesink/filesinkthread.cpp @@ -34,9 +34,9 @@ FileSinkThread::FileSinkThread(std::ofstream *samplesStream, SampleSourceFifo* s m_samplerate(0), m_log2Interpolation(0), m_throttlems(FILESINK_THROTTLE_MS), + m_maxThrottlems(50), m_throttleToggle(false), - m_buf(0), - m_maxThrottlems(50) + m_buf(0) { assert(m_ofstream != 0); } @@ -147,8 +147,6 @@ void FileSinkThread::setLog2Interpolation(int log2Interpolation) void FileSinkThread::run() { - int res; - m_running = true; m_startWaiter.wakeAll(); diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index c0d4161db..978199235 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -182,11 +182,11 @@ void HackRFOutputGui::displaySettings() void HackRFOutputGui::displayBandwidths() { - int savedIndex = HackRFBandwidths::getBandwidthIndex(m_settings.m_bandwidth/1000); + unsigned int savedIndex = HackRFBandwidths::getBandwidthIndex(m_settings.m_bandwidth/1000); ui->bbFilter->blockSignals(true); ui->bbFilter->clear(); - for (int i = 0; i < HackRFBandwidths::m_nb_bw; i++) + for (unsigned int i = 0; i < HackRFBandwidths::m_nb_bw; i++) { ui->bbFilter->addItem(QString("%1M").arg(QString::number(HackRFBandwidths::m_bw_k[i]/1000.0, 'f', 2))); } diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp index 764809419..6d5344ce0 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputplugin.cpp @@ -90,7 +90,7 @@ PluginInterface::SamplingDevices HackRFOutputPlugin::enumSampleSinks() uint32_t serial_lsb = read_partid_serialno.serial_no[3]; QString serial_str = QString::number(serial_msb, 16) + QString::number(serial_lsb, 16); - uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb; + //uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb; QString displayedName(QString("HackRF[%1] %2").arg(i).arg(serial_str)); result.append(SamplingDevice(displayedName, diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputsettings.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputsettings.cpp index e80df6b92..d15ae3580 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputsettings.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputsettings.cpp @@ -64,8 +64,6 @@ bool HackRFOutputSettings::deserialize(const QByteArray& data) if (d.getVersion() == 1) { - int intval; - d.readS32(1, &m_LOppmTenths, 0); d.readBool(3, &m_biasT, false); d.readU32(4, &m_log2Interp, 0); diff --git a/plugins/samplesink/limesdroutput/limesdroutput.cpp b/plugins/samplesink/limesdroutput/limesdroutput.cpp index 4ef572d90..bf784f1d0 100644 --- a/plugins/samplesink/limesdroutput/limesdroutput.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutput.cpp @@ -93,7 +93,7 @@ bool LimeSDROutput::openDevice() char *busyChannels = new char[deviceParams->m_nbTxChannels]; memset(busyChannels, 0, deviceParams->m_nbTxChannels); - for (int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) + for (unsigned int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) { DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); @@ -186,7 +186,7 @@ void LimeSDROutput::suspendBuddies() { // suspend Tx buddy's threads - for (int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) + for (unsigned int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) { DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); @@ -198,7 +198,7 @@ void LimeSDROutput::suspendBuddies() // suspend Rx buddy's threads - for (int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) + for (unsigned int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) { DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); @@ -213,7 +213,7 @@ void LimeSDROutput::resumeBuddies() { // resume Tx buddy's threads - for (int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) + for (unsigned int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) { DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); @@ -225,7 +225,7 @@ void LimeSDROutput::resumeBuddies() // resume Rx buddy's threads - for (int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) + for (unsigned int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) { DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 36dadee7e..d3ba751b1 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -141,7 +141,7 @@ bool LimeSDROutputGUI::deserialize(const QByteArray& data) } } -bool LimeSDROutputGUI::handleMessage(const Message& message) // TODO: does not seem to be really useful in any of the source (+sink?) plugins +bool LimeSDROutputGUI::handleMessage(const Message& message __attribute__((unused))) // TODO: does not seem to be really useful in any of the source (+sink?) plugins { return false; } @@ -373,7 +373,7 @@ void LimeSDROutputGUI::on_ncoEnable_toggled(bool checked) sendSettings(); } -void LimeSDROutputGUI::on_ncoReset_clicked(bool checked) +void LimeSDROutputGUI::on_ncoReset_clicked(bool checked __attribute__((unused))) { m_settings.m_ncoFrequency = 0; ui->ncoFrequency->setValue(m_settings.m_centerFrequency/1000); diff --git a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp index 0f5f3043d..69fed561e 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputthread.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputthread.cpp @@ -67,8 +67,9 @@ void LimeSDROutputThread::setFcPos(int fcPos) void LimeSDROutputThread::run() { - int res, count, msleep, mdelta; - lms_stream_status_t streamStatus; + //int count, msleep, mdelta; + int res; + //lms_stream_status_t streamStatus; lms_stream_meta_t metadata; //Use metadata for additional control over sample receive function behaviour metadata.flushPartialPacket = false; //Do not discard data remainder when read size differs from packet size @@ -83,7 +84,7 @@ void LimeSDROutputThread::run() qDebug("LimeSDROutputThread::run: stream started"); } - count = 0; +// count = 0; // msleep = LIMESDROUTPUT_BLOCKSIZE/(m_sampleRate/1e6f); // mdelta = msleep/100; // msleep = (3*msleep)/4; // to start faster diff --git a/plugins/samplesink/sdrdaemonsink/UDPSocket.cpp b/plugins/samplesink/sdrdaemonsink/UDPSocket.cpp index f2b02d207..a87127535 100644 --- a/plugins/samplesink/sdrdaemonsink/UDPSocket.cpp +++ b/plugins/samplesink/sdrdaemonsink/UDPSocket.cpp @@ -62,14 +62,14 @@ CSocket::CSocket( int sockDesc ) m_sockDesc = sockDesc; } -CSocket::CSocket( const CSocket &sock ) +CSocket::CSocket(const CSocket &sock) { - + m_sockDesc = sock.m_sockDesc; } -void CSocket::operator=( const CSocket &sock ) +void CSocket::operator=(const CSocket &sock) { - + m_sockDesc = sock.m_sockDesc; } std::string CSocket::GetLocalAddress() throw(CSocketException) diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp index 4128009da..89be7331f 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp @@ -53,7 +53,7 @@ SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : m_nnSender = nn_socket(AF_SP, NN_PAIR); assert(m_nnSender != -1); int millis = 500; - int rc = nn_setsockopt (m_nnSender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis)); + nn_setsockopt (m_nnSender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis)); assert (rc == 0); ui->setupUi(this); @@ -262,7 +262,6 @@ void SDRdaemonSinkGui::sendControl(bool force) std::ostringstream os; int nbArgs = 0; - bool ok; if ((m_settings.m_centerFrequency != m_controlSettings.m_centerFrequency) || force) { @@ -455,11 +454,11 @@ void SDRdaemonSinkGui::on_specificParms_returnPressed() sendControl(); } -void on_applyButton_clicked(bool checked) +void on_applyButton_clicked(bool checked __attribute__((unused))) { } -void on_sendButton_clicked(bool checked) +void on_sendButton_clicked(bool checked __attribute__((unused))) { } diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp index 86baa58f2..4a5f7e2e0 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp @@ -37,10 +37,10 @@ MESSAGE_CLASS_DEFINITION(SDRdaemonSinkOutput::MsgReportSDRdaemonSinkStreamTiming SDRdaemonSinkOutput::SDRdaemonSinkOutput(DeviceSinkAPI *deviceAPI, const QTimer& masterTimer) : m_deviceAPI(deviceAPI), m_settings(), + m_sdrDaemonSinkThread(0), m_deviceDescription("SDRdaemonSink"), - m_startingTimeStamp(0), - m_masterTimer(masterTimer), - m_sdrDaemonSinkThread(0) + m_startingTimeStamp(0), + m_masterTimer(masterTimer) { } diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp index b0c9ed25a..f1913ff0d 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinksettings.cpp @@ -63,7 +63,6 @@ bool SDRdaemonSinkSettings::deserialize(const QByteArray& data) if (d.getVersion() == 1) { - int intval; quint32 uintval; d.readU64(1, &m_sampleRate, 48000); d.readU32(2, &m_log2Interp, 0); diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.cpp index 5b5a4f8dd..71f1eb3c2 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkthread.cpp @@ -31,8 +31,8 @@ SDRdaemonSinkThread::SDRdaemonSinkThread(SampleSourceFifo* sampleFifo, QObject* m_samplesCount(0), m_samplerate(0), m_throttlems(SDRDAEMONSINK_THROTTLE_MS), - m_throttleToggle(false), - m_maxThrottlems(50) + m_maxThrottlems(50), + m_throttleToggle(false) { } @@ -94,8 +94,6 @@ void SDRdaemonSinkThread::setSamplerate(int samplerate) void SDRdaemonSinkThread::run() { - int res; - m_running = true; m_startWaiter.wakeAll(); diff --git a/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp b/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp index ac8dc7be9..2ce4a6d81 100644 --- a/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp +++ b/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp @@ -91,7 +91,6 @@ void UDPSinkFEC::write(const SampleVector::iterator& begin, uint32_t sampleChunk while (it != end) { - int inSamplesIndex = it - begin; int inRemainingSamples = end - it; if (m_txBlockIndex == 0) // Tx block index 0 is a block with only meta data @@ -266,7 +265,7 @@ void UDPSinkFECWorker::encodeAndTransmit(UDPSinkFEC::SuperBlock *txBlockx, uint1 { qDebug("UDPSinkFECWorker::encodeAndTransmit: transmit frame without FEC to %s:%d", m_remoteAddress.toStdString().c_str(), m_remotePort); - for (int i = 0; i < UDPSinkFEC::m_nbOriginalBlocks; i++) + for (unsigned int i = 0; i < UDPSinkFEC::m_nbOriginalBlocks; i++) { m_socket.SendDataGram((const void *) &txBlockx[i], (int) UDPSinkFEC::m_udpSize, m_remoteAddress.toStdString(), (uint32_t) m_remotePort); //m_udpSocket->writeDatagram((const char *) &txBlockx[i], (int) UDPSinkFEC::m_udpSize, m_remoteAddress, m_remotePort); diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp index aa028405e..653d739f8 100644 --- a/plugins/samplesource/airspy/airspygui.cpp +++ b/plugins/samplesource/airspy/airspygui.cpp @@ -122,7 +122,7 @@ bool AirspyGui::deserialize(const QByteArray& data) } } -bool AirspyGui::handleMessage(const Message& message) +bool AirspyGui::handleMessage(const Message& message __attribute__((unused))) { return false; // if (AirspyInput::MsgReportAirspy::match(message)) @@ -214,14 +214,14 @@ void AirspyGui::displaySettings() void AirspyGui::displaySampleRates() { - int savedIndex = m_settings.m_devSampleRateIndex; + unsigned int savedIndex = m_settings.m_devSampleRateIndex; ui->sampleRate->blockSignals(true); if (m_rates.size() > 0) { ui->sampleRate->clear(); - for (int i = 0; i < m_rates.size(); i++) + for (unsigned int i = 0; i < m_rates.size(); i++) { ui->sampleRate->addItem(QString("%1").arg(QString::number(m_rates[i]/1000000.0, 'f', 1))); } diff --git a/plugins/samplesource/airspy/airspyinput.cpp b/plugins/samplesource/airspy/airspyinput.cpp index e8d9c4964..e51c16344 100644 --- a/plugins/samplesource/airspy/airspyinput.cpp +++ b/plugins/samplesource/airspy/airspyinput.cpp @@ -99,7 +99,7 @@ bool AirspyInput::openDevice() m_sampleRates.clear(); - for (int i=0; igetSinkBuddies().size() > 0) { DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[0]; - DeviceBladeRFParams *buddySharedParams = (DeviceBladeRFParams *) buddy->getBuddySharedPtr(); if (buddy->getDeviceSinkEngine()->state() == DSPDeviceSinkEngine::StRunning) // Tx side running { diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp index 4dde1c3d7..fd28db1bd 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp @@ -50,7 +50,7 @@ BladerfInputGui::BladerfInputGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : ui->sampleRate->setValueRange(8, 330000U, BLADERF_SAMPLERATE_REC_MAX); ui->bandwidth->clear(); - for (int i = 0; i < BladerfBandwidths::getNbBandwidths(); i++) + for (unsigned int i = 0; i < BladerfBandwidths::getNbBandwidths(); i++) { ui->bandwidth->addItem(QString::number(BladerfBandwidths::getBandwidth(i))); } @@ -128,7 +128,7 @@ bool BladerfInputGui::deserialize(const QByteArray& data) } } -bool BladerfInputGui::handleMessage(const Message& message) +bool BladerfInputGui::handleMessage(const Message& message __attribute__((unused))) { return false; } diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index aaee1db48..a2ea94658 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -213,7 +213,7 @@ bool FCDProGui::deserialize(const QByteArray& data) } } -bool FCDProGui::handleMessage(const Message& message) +bool FCDProGui::handleMessage(const Message& message __attribute__((unused))) { return false; } @@ -400,7 +400,7 @@ void FCDProGui::on_gain6_currentIndexChanged(int index) sendSettings(); } -void FCDProGui::on_setDefaults_clicked(bool checked) +void FCDProGui::on_setDefaults_clicked(bool checked __attribute__((unused))) { m_settings.m_lnaGainIndex = 8; // +15 dB //m_settings.rfFilterIndex = 0; diff --git a/plugins/samplesource/fcdpro/fcdproinput.cpp b/plugins/samplesource/fcdpro/fcdproinput.cpp index e3b2f96e5..a0a9a6b5f 100644 --- a/plugins/samplesource/fcdpro/fcdproinput.cpp +++ b/plugins/samplesource/fcdpro/fcdproinput.cpp @@ -387,9 +387,9 @@ void FCDProInput::set_center_freq(double freq) } -void FCDProInput::set_bias_t(bool on) +void FCDProInput::set_bias_t(bool on __attribute__((unused))) { - quint8 cmd = on ? 1 : 0; + //quint8 cmd = on ? 1 : 0; // TODO: use FCD Pro controls //fcdAppSetParam(m_dev, FCD_CMD_APP_SET_BIAS_TEE, &cmd, 1); diff --git a/plugins/samplesource/fcdpro/fcdprosettings.cpp b/plugins/samplesource/fcdpro/fcdprosettings.cpp index 76466133b..6ef1873a5 100644 --- a/plugins/samplesource/fcdpro/fcdprosettings.cpp +++ b/plugins/samplesource/fcdpro/fcdprosettings.cpp @@ -86,8 +86,6 @@ bool FCDProSettings::deserialize(const QByteArray& data) if (d.getVersion() == 1) { - int intval; - d.readBool(1, &m_dcBlock, false); d.readBool(2, &m_iqCorrection, false); d.readS32(3, &m_LOppmTenths, 0); diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index 746b0afd8..a71460b39 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -131,7 +131,7 @@ bool FCDProPlusGui::deserialize(const QByteArray& data) } } -bool FCDProPlusGui::handleMessage(const Message& message) +bool FCDProPlusGui::handleMessage(const Message& message __attribute__((unused))) { return false; } diff --git a/plugins/samplesource/fcdproplus/fcdproplussettings.cpp b/plugins/samplesource/fcdproplus/fcdproplussettings.cpp index abfec244b..ad557d39d 100644 --- a/plugins/samplesource/fcdproplus/fcdproplussettings.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplussettings.cpp @@ -66,8 +66,6 @@ bool FCDProPlusSettings::deserialize(const QByteArray& data) if (d.getVersion() == 1) { - int intval; - d.readBool(1, &m_biasT, false); d.readBool(2, &m_rangeLow, false); d.readBool(3, &m_mixGain, true); diff --git a/plugins/samplesource/filesource/filesourcegui.cpp b/plugins/samplesource/filesource/filesourcegui.cpp index bc4c7ee90..57d73ab48 100644 --- a/plugins/samplesource/filesource/filesourcegui.cpp +++ b/plugins/samplesource/filesource/filesourcegui.cpp @@ -209,7 +209,7 @@ void FileSourceGui::sendSettings() { } -void FileSourceGui::on_playLoop_toggled(bool checked) +void FileSourceGui::on_playLoop_toggled(bool checked __attribute__((unused))) { // TODO: do something about it! } @@ -281,7 +281,7 @@ void FileSourceGui::on_navTimeSlider_valueChanged(int value) } } -void FileSourceGui::on_showFileDialog_clicked(bool checked) +void FileSourceGui::on_showFileDialog_clicked(bool checked __attribute__((unused))) { QString fileName = QFileDialog::getOpenFileName(this, tr("Open I/Q record file"), ".", tr("SDR I/Q Files (*.sdriq)")); diff --git a/plugins/samplesource/filesource/filesourceinput.cpp b/plugins/samplesource/filesource/filesourceinput.cpp index 86b9f09f8..08d25b6c0 100644 --- a/plugins/samplesource/filesource/filesourceinput.cpp +++ b/plugins/samplesource/filesource/filesourceinput.cpp @@ -64,7 +64,6 @@ bool FileSourceInput::Settings::deserialize(const QByteArray& data) } if(d.getVersion() == 1) { - int intval; d.readString(1, &m_fileName, "./test.sdriq"); return true; } else { diff --git a/plugins/samplesource/filesource/filesourcethread.cpp b/plugins/samplesource/filesource/filesourcethread.cpp index 293d9c6ff..0df5d73c5 100644 --- a/plugins/samplesource/filesource/filesourcethread.cpp +++ b/plugins/samplesource/filesource/filesourcethread.cpp @@ -125,8 +125,6 @@ void FileSourceThread::setBuffer(std::size_t chunksize) void FileSourceThread::run() { - int res; - m_running = true; m_startWaiter.wakeAll(); diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index fe3a51d5a..4641832b0 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -202,11 +202,11 @@ void HackRFInputGui::displaySettings() void HackRFInputGui::displayBandwidths() { - int savedIndex = HackRFBandwidths::getBandwidthIndex(m_settings.m_bandwidth/1000); + unsigned int savedIndex = HackRFBandwidths::getBandwidthIndex(m_settings.m_bandwidth/1000); ui->bbFilter->blockSignals(true); ui->bbFilter->clear(); - for (int i = 0; i < HackRFBandwidths::m_nb_bw; i++) + for (unsigned int i = 0; i < HackRFBandwidths::m_nb_bw; i++) { ui->bbFilter->addItem(QString("%1M").arg(QString::number(HackRFBandwidths::m_bw_k[i]/1000.0, 'f', 2))); } diff --git a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp index e20944892..467703c53 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputplugin.cpp @@ -90,7 +90,7 @@ PluginInterface::SamplingDevices HackRFInputPlugin::enumSampleSources() uint32_t serial_lsb = read_partid_serialno.serial_no[3]; QString serial_str = QString::number(serial_msb, 16) + QString::number(serial_lsb, 16); - uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb; + //uint64_t serial_num = (((uint64_t) serial_msb)<<32) + serial_lsb; QString displayedName(QString("HackRF[%1] %2").arg(i).arg(serial_str)); result.append(SamplingDevice(displayedName, diff --git a/plugins/samplesource/limesdrinput/limesdrinput.cpp b/plugins/samplesource/limesdrinput/limesdrinput.cpp index 32bbe3730..a5570a0c9 100644 --- a/plugins/samplesource/limesdrinput/limesdrinput.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinput.cpp @@ -104,7 +104,7 @@ bool LimeSDRInput::openDevice() char *busyChannels = new char[deviceParams->m_nbRxChannels]; memset(busyChannels, 0, deviceParams->m_nbRxChannels); - for (int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) + for (unsigned int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) { DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); @@ -197,7 +197,7 @@ void LimeSDRInput::suspendBuddies() { // suspend Rx buddy's threads - for (int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) + for (unsigned int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) { DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); @@ -209,7 +209,7 @@ void LimeSDRInput::suspendBuddies() // suspend Tx buddy's threads - for (int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) + for (unsigned int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) { DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); @@ -224,7 +224,7 @@ void LimeSDRInput::resumeBuddies() { // resume Rx buddy's threads - for (int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) + for (unsigned int i = 0; i < m_deviceAPI->getSourceBuddies().size(); i++) { DeviceSourceAPI *buddy = m_deviceAPI->getSourceBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); @@ -236,7 +236,7 @@ void LimeSDRInput::resumeBuddies() // resume Tx buddy's threads - for (int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) + for (unsigned int i = 0; i < m_deviceAPI->getSinkBuddies().size(); i++) { DeviceSinkAPI *buddy = m_deviceAPI->getSinkBuddies()[i]; DeviceLimeSDRShared *buddyShared = (DeviceLimeSDRShared *) buddy->getBuddySharedPtr(); diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index 3d70e0981..f0f17019c 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -144,7 +144,7 @@ bool LimeSDRInputGUI::deserialize(const QByteArray& data) } } -bool LimeSDRInputGUI::handleMessage(const Message& message) // TODO: does not seem to be really useful in any of the source (+sink?) plugins +bool LimeSDRInputGUI::handleMessage(const Message& message __attribute__((unused))) // TODO: does not seem to be really useful in any of the source (+sink?) plugins { return false; } @@ -393,7 +393,7 @@ void LimeSDRInputGUI::on_ncoEnable_toggled(bool checked) sendSettings(); } -void LimeSDRInputGUI::on_ncoReset_clicked(bool checked) +void LimeSDRInputGUI::on_ncoReset_clicked(bool checked __attribute__((unused))) { m_settings.m_ncoFrequency = 0; ui->ncoFrequency->setValue(m_settings.m_centerFrequency/1000); diff --git a/plugins/samplesource/limesdrinput/limesdrinputthread.h b/plugins/samplesource/limesdrinput/limesdrinputthread.h index a0da4fabe..38dbec979 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputthread.h +++ b/plugins/samplesource/limesdrinput/limesdrinputthread.h @@ -39,7 +39,7 @@ public: virtual void startWork(); virtual void stopWork(); - virtual void setDeviceSampleRate(int sampleRate) {} + virtual void setDeviceSampleRate(int sampleRate __attribute__((unused))) {} void setLog2Decimation(unsigned int log2_decim); void setFcPos(int fcPos); diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index ad14674ba..e08acaff8 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -306,7 +306,7 @@ void RTLSDRGui::on_gain_valueChanged(int value) sendSettings(); } -void RTLSDRGui::on_sampleRate_currentIndexChanged(int index) +void RTLSDRGui::on_sampleRate_currentIndexChanged(int index __attribute__((unused))) { } diff --git a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp index 35a6e54c1..669f678a9 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrinput.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrinput.cpp @@ -238,7 +238,7 @@ bool RTLSDRInput::handleMessage(const Message& message) } else if (MsgQueryRTLSDR::match(message)) { - MsgQueryRTLSDR& conf = (MsgQueryRTLSDR&) message; + //MsgQueryRTLSDR& conf = (MsgQueryRTLSDR&) message; qDebug() << "RTLSDRInput::handleMessage: MsgQueryRTLSDR"; MsgReportRTLSDR *message = MsgReportRTLSDR::create(m_gains); diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.cpp b/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.cpp index 8ad20703a..3a419d709 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.cpp @@ -95,7 +95,7 @@ SDRdaemonBuffer::~SDRdaemonBuffer() void SDRdaemonBuffer::updateBufferSize(uint32_t sampleRate) { - uint32_t rawSize = sampleRate * m_iqSampleSize * m_rawBufferLengthSeconds; // store worth of this seconds of samples at this sample rate + int rawSize = sampleRate * m_iqSampleSize * m_rawBufferLengthSeconds; // store worth of this seconds of samples at this sample rate if ((m_frameSize > 0) && (rawSize / m_frameSize < m_rawBufferMinNbFrames)) { @@ -148,9 +148,8 @@ void SDRdaemonBuffer::updateReadBufferSize(uint32_t length) m_readBuffer = new uint8_t[length]; } -bool SDRdaemonBuffer::readMeta(char *array, uint32_t length) +bool SDRdaemonBuffer::readMeta(char *array) { - assert(length >= sizeof(MetaData) + 8); MetaData *metaData = (MetaData *) array; if (m_crc64.calculate_crc((uint8_t *) array, sizeof(MetaData) - 8) == metaData->m_crc) @@ -183,7 +182,7 @@ bool SDRdaemonBuffer::readMeta(char *array, uint32_t length) { m_sampleBytes = metaData->m_sampleBytes & 0x0F; uint32_t frameSize = m_iqSampleSize * metaData->m_nbSamples * metaData->m_nbBlocks; - int sampleRate = metaData->m_sampleRate; + uint32_t sampleRate = metaData->m_sampleRate; if (sampleRate != m_sampleRateStream) // change of nominal stream sample rate { @@ -337,7 +336,7 @@ uint8_t *SDRdaemonBuffer::readData(int32_t length) } } -void SDRdaemonBuffer::writeDataLZ4(const char *array, uint32_t length) +void SDRdaemonBuffer::writeDataLZ4(const char *array, int length) { if (m_lz4InCount + length < m_lz4InSize) { @@ -394,7 +393,7 @@ void SDRdaemonBuffer::writeToRawBufferLZ4() } } -void SDRdaemonBuffer::writeToRawBufferUncompressed(const char *array, uint32_t length) +void SDRdaemonBuffer::writeToRawBufferUncompressed(const char *array, int length) { // TODO: handle the 1 byte per I or Q sample if (m_writeIndex + length < m_rawSize) diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.h b/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.h index d630c74e0..1b2c8af02 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemonbuffer.h @@ -63,7 +63,7 @@ public: SDRdaemonBuffer(uint32_t throttlems); ~SDRdaemonBuffer(); - bool readMeta(char *array, uint32_t length); //!< Attempt to read meta. Returns true if meta block + bool readMeta(char *array); //!< Attempt to read meta. Returns true if meta block void writeData(char *array, uint32_t length); //!< Write data into buffer. uint8_t *readData(int32_t length); void updateBlockCounts(uint32_t nbBytesReceived); @@ -118,15 +118,15 @@ private: void updateBufferSize(uint32_t sampleRate); void updateLZ4Sizes(uint32_t frameSize); void updateReadBufferSize(uint32_t length); - void writeDataLZ4(const char *array, uint32_t length); + void writeDataLZ4(const char *array, int length); void writeToRawBufferLZ4(); - void writeToRawBufferUncompressed(const char *array, uint32_t length); + void writeToRawBufferUncompressed(const char *array, int length); void resetIndexes(); static void printMeta(const QString& header, MetaData *metaData); uint32_t m_throttlemsNominal; //!< Initial throttle in ms - uint32_t m_rawSize; //!< Size of the raw samples buffer in bytes + int m_rawSize; //!< Size of the raw samples buffer in bytes uint8_t *m_rawBuffer; //!< Buffer for raw samples obtained from UDP (I/Q not in a formal I/Q structure) uint32_t m_sampleRateStream; //!< Current sample rate from the stream meta data uint32_t m_sampleRate; //!< Current actual sample rate in Hz @@ -142,8 +142,8 @@ private: uint32_t m_bytesInBlock; //!< Number of bytes received in the current UDP block uint64_t m_dataCRC; //!< CRC64 of the data block uint32_t m_inCount; //!< Current position of uncompressed input - uint32_t m_lz4InCount; //!< Current position in LZ4 input buffer - uint32_t m_lz4InSize; //!< Size in bytes of the LZ4 input data + int m_lz4InCount; //!< Current position in LZ4 input buffer + int m_lz4InSize; //!< Size in bytes of the LZ4 input data uint8_t *m_lz4InBuffer; //!< Buffer for LZ4 compressed input uint8_t *m_lz4OutBuffer; //!< Buffer for LZ4 uncompressed output uint32_t m_frameSize; //!< Size in bytes of one uncompressed frame @@ -156,7 +156,7 @@ private: int32_t m_writeIndex; //!< Current write position in the raw samples buffer int32_t m_readIndex; //!< Current read position in the raw samples buffer - uint32_t m_readSize; //!< Read buffer size + int m_readSize; //!< Read buffer size uint8_t *m_readBuffer; //!< Read buffer to hold samples when looping back to beginning of raw buffer bool m_autoFollowRate; //!< Auto follow stream sample rate else stick with meta data sample rate diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp b/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp index 118f37393..bc3eb8a90 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.cpp @@ -75,7 +75,7 @@ SDRdaemonGui::SDRdaemonGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : m_sender = nn_socket(AF_SP, NN_PAIR); assert(m_sender != -1); int millis = 500; - int rc = nn_setsockopt (m_sender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis)); + nn_setsockopt (m_sender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis)); assert (rc == 0); m_startingTimeStamp.tv_sec = 0; @@ -189,7 +189,6 @@ bool SDRdaemonGui::deserialize(const QByteArray& data) { SimpleDeserializer d(data); QString address; - uint32_t uintval; quint16 dataPort; bool dcBlock; bool iqCorrection; @@ -401,7 +400,7 @@ void SDRdaemonGui::displayConfigurationParameters(uint32_t freq, ui->specificParms->setCursorPosition(0); } -void SDRdaemonGui::on_applyButton_clicked(bool checked) +void SDRdaemonGui::on_applyButton_clicked(bool checked __attribute__((unused))) { bool dataOk, ctlOk; QString udpAddress = ui->address->text(); @@ -432,7 +431,7 @@ void SDRdaemonGui::on_applyButton_clicked(bool checked) ui->applyButton->setEnabled(false); } -void SDRdaemonGui::on_sendButton_clicked(bool checked) +void SDRdaemonGui::on_sendButton_clicked(bool checked __attribute__((unused))) { sendConfiguration(); ui->specificParms->setCursorPosition(0); @@ -500,19 +499,19 @@ void SDRdaemonGui::sendConfiguration() } } -void SDRdaemonGui::on_address_textEdited(const QString& arg1) +void SDRdaemonGui::on_address_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyButton->setEnabled(true); m_addressEdited = true; } -void SDRdaemonGui::on_dataPort_textEdited(const QString& arg1) +void SDRdaemonGui::on_dataPort_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyButton->setEnabled(true); m_dataPortEdited = true; } -void SDRdaemonGui::on_controlPort_textEdited(const QString& arg1) +void SDRdaemonGui::on_controlPort_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyButton->setEnabled(true); } @@ -551,33 +550,33 @@ void SDRdaemonGui::on_autoCorrBuffer_toggled(bool checked) } } -void SDRdaemonGui::on_resetIndexes_clicked(bool checked) +void SDRdaemonGui::on_resetIndexes_clicked(bool checked __attribute__((unused))) { SDRdaemonInput::MsgConfigureSDRdaemonResetIndexes* message = SDRdaemonInput::MsgConfigureSDRdaemonResetIndexes::create(); m_sampleSource->getInputMessageQueue()->push(message); } -void SDRdaemonGui::on_freq_textEdited(const QString& arg1) +void SDRdaemonGui::on_freq_textEdited(const QString& arg1 __attribute__((unused))) { ui->sendButton->setEnabled(true); } -void SDRdaemonGui::on_sampleRate_textEdited(const QString& arg1) +void SDRdaemonGui::on_sampleRate_textEdited(const QString& arg1 __attribute__((unused))) { ui->sendButton->setEnabled(true); } -void SDRdaemonGui::on_specificParms_textEdited(const QString& arg1) +void SDRdaemonGui::on_specificParms_textEdited(const QString& arg1 __attribute__((unused))) { ui->sendButton->setEnabled(true); } -void SDRdaemonGui::on_decim_currentIndexChanged(int index) +void SDRdaemonGui::on_decim_currentIndexChanged(int index __attribute__((unused))) { ui->sendButton->setEnabled(true); } -void SDRdaemonGui::on_fcPos_currentIndexChanged(int index) +void SDRdaemonGui::on_fcPos_currentIndexChanged(int index __attribute__((unused))) { ui->sendButton->setEnabled(true); } diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp b/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp index 4ac315f4c..84190be4e 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp +++ b/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp @@ -149,7 +149,7 @@ void SDRdaemonUDPHandler::processData() { m_sdrDaemonBuffer.updateBlockCounts(m_udpReadBytes); - if (m_sdrDaemonBuffer.readMeta(m_udpBuf, m_udpReadBytes)) + if (m_sdrDaemonBuffer.readMeta(m_udpBuf)) { const SDRdaemonBuffer::MetaData& metaData = m_sdrDaemonBuffer.getCurrentMeta(); bool change = false; diff --git a/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h b/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h index 1beebfa2f..f5e807557 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h +++ b/plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h @@ -74,7 +74,7 @@ private: uint32_t m_readLengthSamples; uint32_t m_readLength; bool m_throttleToggle; - int m_rateDivider; + uint32_t m_rateDivider; bool m_autoCorrBuffer; void setSamplerate(uint32_t samplerate); diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp index aa187bad8..eec6c681b 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.cpp @@ -29,24 +29,24 @@ const int SDRdaemonFECBuffer::m_sampleSize = 2; const int SDRdaemonFECBuffer::m_iqSampleSize = 2 * m_sampleSize; SDRdaemonFECBuffer::SDRdaemonFECBuffer(uint32_t throttlems) : - m_frameHead(0), m_decoderIndexHead(nbDecoderSlots/2), + m_frameHead(0), m_curNbBlocks(0), m_minNbBlocks(256), + m_curOriginalBlocks(0), m_minOriginalBlocks(128), m_curNbRecovery(0), m_maxNbRecovery(0), m_framesDecoded(true), - m_throttlemsNominal(throttlems), m_readIndex(0), + m_throttlemsNominal(throttlems), m_readBuffer(0), m_readSize(0), m_bufferLenSec(0.0f), - m_nbReads(0), - m_nbWrites(0), - m_balCorrection(0), - m_balCorrLimit(0), - m_curOriginalBlocks(0) + m_nbReads(0), + m_nbWrites(0), + m_balCorrection(0), + m_balCorrLimit(0) { m_currentMeta.init(); m_framesNbBytes = nbDecoderSlots * sizeof(BufferFrame); @@ -141,7 +141,7 @@ void SDRdaemonFECBuffer::rwCorrectionEstimate(int slotIndex) int dBytes; int rwDelta = (m_nbReads * m_readNbBytes) - (m_nbWrites * sizeof(BufferFrame)); - if (normalizedReadIndex < (nbDecoderSlots/ 2) * sizeof(BufferFrame)) // read leads + if (normalizedReadIndex < (nbDecoderSlots/ 2) * (int) sizeof(BufferFrame)) // read leads { dBytes = - normalizedReadIndex - rwDelta; } @@ -158,8 +158,6 @@ void SDRdaemonFECBuffer::rwCorrectionEstimate(int slotIndex) m_balCorrection = m_balCorrLimit; } - float rwRatio = (float) (m_nbWrites * sizeof(BufferFrame)) / (float) (m_nbReads * m_readNbBytes); - m_nbReads = 0; m_nbWrites = 0; } @@ -190,7 +188,7 @@ void SDRdaemonFECBuffer::checkSlotData(int slotIndex) } } -void SDRdaemonFECBuffer::writeData(char *array, uint32_t length) +void SDRdaemonFECBuffer::writeData(char *array) { SuperBlock *superBlock = (SuperBlock *) array; int frameIndex = superBlock->header.frameIndex; @@ -323,7 +321,7 @@ void SDRdaemonFECBuffer::writeData(char *array, uint32_t length) } // decode } -void SDRdaemonFECBuffer::writeData0(char *array, uint32_t length) +void SDRdaemonFECBuffer::writeData0(char *array __attribute__((unused)), uint32_t length __attribute__((unused))) { // Kept as comments for the out of sync blocks algorithms // assert(length == m_udpPayloadSize); diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h index e52dc1f8b..3a18cfc13 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h @@ -87,7 +87,7 @@ public: ~SDRdaemonFECBuffer(); // R/W operations - void writeData(char *array, uint32_t length); //!< Write data into buffer. + void writeData(char *array); //!< Write data into buffer. void writeData0(char *array, uint32_t length); //!< Write data into buffer. uint8_t *readData(int32_t length); //!< Read data from buffer @@ -148,7 +148,6 @@ public: { int32_t val = (m_wrDeltaEstimate * 100) / (int32_t) m_framesNbBytes; int32_t ret = val < 0 ? -val - 50 : 50 -val; - int32_t rp = (m_readIndex * 100) / (int32_t) m_framesNbBytes; return ret; } else @@ -210,7 +209,7 @@ private: uint32_t m_throttlemsNominal; //!< Initial throttle in ms uint8_t* m_readBuffer; //!< Read buffer to hold samples when looping back to beginning of raw buffer - uint32_t m_readSize; //!< Read buffer size + int m_readSize; //!< Read buffer size float m_bufferLenSec; diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp index 36fb79c70..6c37818d3 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp @@ -54,23 +54,23 @@ SDRdaemonFECGui::SDRdaemonFECGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : m_framesDecodingStatus(0), m_bufferLengthInSecs(0.0), m_bufferGauge(-50), - m_samplesCount(0), - m_tickCount(0), - m_address("127.0.0.1"), - m_dataPort(9090), - m_controlPort(9091), - m_addressEdited(false), - m_dataPortEdited(false), - m_initSendConfiguration(false), - m_dcBlock(false), - m_iqCorrection(false), m_nbOriginalBlocks(128), - m_nbFECBlocks(0) + m_nbFECBlocks(0), + m_samplesCount(0), + m_tickCount(0), + m_address("127.0.0.1"), + m_dataPort(9090), + m_controlPort(9091), + m_addressEdited(false), + m_dataPortEdited(false), + m_initSendConfiguration(false), + m_dcBlock(false), + m_iqCorrection(false) { m_sender = nn_socket(AF_SP, NN_PAIR); assert(m_sender != -1); int millis = 500; - int rc = nn_setsockopt (m_sender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis)); + nn_setsockopt (m_sender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis)); assert (rc == 0); m_paletteGreenText.setColor(QPalette::WindowText, Qt::green); @@ -185,7 +185,6 @@ bool SDRdaemonFECGui::deserialize(const QByteArray& data) { SimpleDeserializer d(data); QString address; - uint32_t uintval; quint16 dataPort; bool dcBlock; bool iqCorrection; @@ -381,7 +380,7 @@ void SDRdaemonFECGui::displayConfigurationParameters(uint32_t freq, ui->specificParms->setCursorPosition(0); } -void SDRdaemonFECGui::on_applyButton_clicked(bool checked) +void SDRdaemonFECGui::on_applyButton_clicked(bool checked __attribute__((unused))) { bool dataOk, ctlOk; QString udpAddress = ui->address->text(); @@ -412,7 +411,7 @@ void SDRdaemonFECGui::on_applyButton_clicked(bool checked) ui->applyButton->setEnabled(false); } -void SDRdaemonFECGui::on_sendButton_clicked(bool checked) +void SDRdaemonFECGui::on_sendButton_clicked(bool checked __attribute__((unused))) { sendConfiguration(); ui->specificParms->setCursorPosition(0); @@ -481,19 +480,19 @@ void SDRdaemonFECGui::sendConfiguration() } } -void SDRdaemonFECGui::on_address_textEdited(const QString& arg1) +void SDRdaemonFECGui::on_address_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyButton->setEnabled(true); m_addressEdited = true; } -void SDRdaemonFECGui::on_dataPort_textEdited(const QString& arg1) +void SDRdaemonFECGui::on_dataPort_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyButton->setEnabled(true); m_dataPortEdited = true; } -void SDRdaemonFECGui::on_controlPort_textEdited(const QString& arg1) +void SDRdaemonFECGui::on_controlPort_textEdited(const QString& arg1 __attribute__((unused))) { ui->applyButton->setEnabled(true); } @@ -516,27 +515,27 @@ void SDRdaemonFECGui::on_iqImbalance_toggled(bool checked) } } -void SDRdaemonFECGui::on_freq_textEdited(const QString& arg1) +void SDRdaemonFECGui::on_freq_textEdited(const QString& arg1 __attribute__((unused))) { ui->sendButton->setEnabled(true); } -void SDRdaemonFECGui::on_sampleRate_textEdited(const QString& arg1) +void SDRdaemonFECGui::on_sampleRate_textEdited(const QString& arg1 __attribute__((unused))) { ui->sendButton->setEnabled(true); } -void SDRdaemonFECGui::on_specificParms_textEdited(const QString& arg1) +void SDRdaemonFECGui::on_specificParms_textEdited(const QString& arg1 __attribute__((unused))) { ui->sendButton->setEnabled(true); } -void SDRdaemonFECGui::on_decim_currentIndexChanged(int index) +void SDRdaemonFECGui::on_decim_currentIndexChanged(int index __attribute__((unused))) { ui->sendButton->setEnabled(true); } -void SDRdaemonFECGui::on_fcPos_currentIndexChanged(int index) +void SDRdaemonFECGui::on_fcPos_currentIndexChanged(int index __attribute__((unused))) { ui->sendButton->setEnabled(true); } diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp index 8382c6e85..5360de83a 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.cpp @@ -148,7 +148,7 @@ void SDRdaemonFECUDPHandler::dataReadyRead() void SDRdaemonFECUDPHandler::processData() { - m_sdrDaemonBuffer.writeData(m_udpBuf, m_udpReadBytes); + m_sdrDaemonBuffer.writeData(m_udpBuf); const SDRdaemonFECBuffer::MetaDataFEC& metaData = m_sdrDaemonBuffer.getCurrentMeta(); bool change = false; diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h index 0dd3d29c8..024c8d9e6 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecudphandler.h @@ -72,7 +72,7 @@ private: uint32_t m_readLengthSamples; uint32_t m_readLength; bool m_throttleToggle; - int m_rateDivider; + uint32_t m_rateDivider; bool m_autoCorrBuffer; void processData(); diff --git a/plugins/samplesource/sdrplay/sdrplaygui.cpp b/plugins/samplesource/sdrplay/sdrplaygui.cpp index bf703cffb..9cdf90f65 100644 --- a/plugins/samplesource/sdrplay/sdrplaygui.cpp +++ b/plugins/samplesource/sdrplay/sdrplaygui.cpp @@ -42,25 +42,25 @@ SDRPlayGui::SDRPlayGui(DeviceSourceAPI *deviceAPI, QWidget* parent) : ui->centerFrequency->setValueRange(7, 10U, 12000U); ui->fBand->clear(); - for (int i = 0; i < SDRPlayBands::getNbBands(); i++) + for (unsigned int i = 0; i < SDRPlayBands::getNbBands(); i++) { ui->fBand->addItem(SDRPlayBands::getBandName(i)); } ui->ifFrequency->clear(); - for (int i = 0; i < SDRPlayIF::getNbIFs(); i++) + for (unsigned int i = 0; i < SDRPlayIF::getNbIFs(); i++) { ui->ifFrequency->addItem(QString::number(SDRPlayIF::getIF(i)/1000)); } ui->samplerate->clear(); - for (int i = 0; i < SDRPlaySampleRates::getNbRates(); i++) + for (unsigned int i = 0; i < SDRPlaySampleRates::getNbRates(); i++) { ui->samplerate->addItem(QString::number(SDRPlaySampleRates::getRate(i)/1000)); } ui->bandwidth->clear(); - for (int i = 0; i < SDRPlayBandwidths::getNbBandwidths(); i++) + for (unsigned int i = 0; i < SDRPlayBandwidths::getNbBandwidths(); i++) { ui->bandwidth->addItem(QString::number(SDRPlayBandwidths::getBandwidth(i)/1000)); } diff --git a/plugins/samplesource/sdrplay/sdrplayinput.cpp b/plugins/samplesource/sdrplay/sdrplayinput.cpp index ac0bf407e..df294d4bd 100644 --- a/plugins/samplesource/sdrplay/sdrplayinput.cpp +++ b/plugins/samplesource/sdrplay/sdrplayinput.cpp @@ -382,7 +382,7 @@ bool SDRPlayInput::applySettings(const SDRPlaySettings& settings, bool forwardCh } else { - mirisdr_get_lna_gain(m_dev); + lnaGain = mirisdr_get_lna_gain(m_dev); } MsgReportSDRPlayGains *message = MsgReportSDRPlayGains::create( diff --git a/sdrbase/device/devicesinkapi.h b/sdrbase/device/devicesinkapi.h index 2fd090856..5f9008230 100644 --- a/sdrbase/device/devicesinkapi.h +++ b/sdrbase/device/devicesinkapi.h @@ -74,7 +74,7 @@ public: const QString& getHardwareId() const { return m_hardwareId; } const QString& getSampleSinkId() const { return m_sampleSinkId; } const QString& getSampleSinkSerial() const { return m_sampleSinkSerial; } - int getSampleSinkSequence() const { return m_sampleSinkSequence; } + uint32_t getSampleSinkSequence() const { return m_sampleSinkSequence; } void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI); void removeChannelInstance(PluginGUI* pluginGUI); @@ -138,7 +138,7 @@ protected: QString m_hardwareId; QString m_sampleSinkId; QString m_sampleSinkSerial; - int m_sampleSinkSequence; + uint32_t m_sampleSinkSequence; PluginGUI* m_sampleSinkPluginGUI; ChannelInstanceRegistrations m_channelInstanceRegistrations; diff --git a/sdrbase/device/devicesourceapi.h b/sdrbase/device/devicesourceapi.h index 2d80c226e..7ea2c4030 100644 --- a/sdrbase/device/devicesourceapi.h +++ b/sdrbase/device/devicesourceapi.h @@ -74,7 +74,7 @@ public: const QString& getHardwareId() const { return m_hardwareId; } const QString& getSampleSourceId() const { return m_sampleSourceId; } const QString& getSampleSourceSerial() const { return m_sampleSourceSerial; } - int getSampleSourceSequence() const { return m_sampleSourceSequence; } + uint32_t getSampleSourceSequence() const { return m_sampleSourceSequence; } void registerChannelInstance(const QString& channelName, PluginGUI* pluginGUI); void removeChannelInstance(PluginGUI* pluginGUI); @@ -138,7 +138,7 @@ protected: QString m_hardwareId; QString m_sampleSourceId; QString m_sampleSourceSerial; - int m_sampleSourceSequence; + uint32_t m_sampleSourceSequence; PluginGUI* m_sampleSourcePluginGUI; ChannelInstanceRegistrations m_channelInstanceRegistrations; diff --git a/sdrbase/dsp/afsquelch.cpp b/sdrbase/dsp/afsquelch.cpp index c7b4de621..ac600af30 100644 --- a/sdrbase/dsp/afsquelch.cpp +++ b/sdrbase/dsp/afsquelch.cpp @@ -54,8 +54,8 @@ AFSquelch::AFSquelch() : } AFSquelch::AFSquelch(unsigned int nbTones, const double *tones) : - m_N(0), m_nbAvg(128), + m_N(0), m_sampleRate(0), m_samplesProcessed(0), m_samplesAvgProcessed(0), diff --git a/sdrbase/dsp/basebandsamplesource.h b/sdrbase/dsp/basebandsamplesource.h index f2adf201b..ce7b0014b 100644 --- a/sdrbase/dsp/basebandsamplesource.h +++ b/sdrbase/dsp/basebandsamplesource.h @@ -35,7 +35,7 @@ public: virtual void start() = 0; virtual void stop() = 0; virtual void pull(Sample& sample) = 0; - virtual void pullAudio(int nbSamples) {} + virtual void pullAudio(int nbSamples __attribute__((unused))) {} /** direct feeding of sample source FIFO */ void feed(SampleSourceFifo* sampleFifo, int nbSamples) diff --git a/sdrbase/dsp/cwkeyer.cpp b/sdrbase/dsp/cwkeyer.cpp index 9e4384529..5482efc42 100644 --- a/sdrbase/dsp/cwkeyer.cpp +++ b/sdrbase/dsp/cwkeyer.cpp @@ -375,14 +375,14 @@ void CWKeyer::nextStateText() case TextStartElement: m_samplePointer = 0; // qDebug() << "CWKeyer::nextStateText: TextStartElement: " << (int) m_asciiToMorse[m_asciiChar][m_elementPointer]; - if (m_asciiToMorse[m_asciiChar][m_elementPointer] == -1) // end of morse character + if (m_asciiToMorse[(uint8_t)(m_asciiChar&0x7F)][m_elementPointer] == -1) // end of morse character { m_elementPointer = 0; m_textState = TextCharSpace; } else { - if (m_asciiToMorse[m_asciiChar][m_elementPointer] == 0) // dot + if (m_asciiToMorse[(uint8_t)(m_asciiChar&0x7F)][m_elementPointer] == 0) // dot { m_dot = true; m_dash = false; @@ -482,7 +482,7 @@ void CWSmoother::setNbFadeSamples(unsigned int nbFadeSamples) m_fadeInSamples = new float[m_nbFadeSamples]; m_fadeOutSamples = new float[m_nbFadeSamples]; - for (int i = 0; i < m_nbFadeSamples; i++) + for (unsigned int i = 0; i < m_nbFadeSamples; i++) { float x = i/ (float) m_nbFadeSamples; float y = 1.0f -x; diff --git a/sdrbase/dsp/cwkeyer.h b/sdrbase/dsp/cwkeyer.h index 1f81b6d07..421a86c8e 100644 --- a/sdrbase/dsp/cwkeyer.h +++ b/sdrbase/dsp/cwkeyer.h @@ -114,8 +114,8 @@ public: private: QMutex m_mutex; - int m_fadeInCounter; - int m_fadeOutCounter; + unsigned int m_fadeInCounter; + unsigned int m_fadeOutCounter; unsigned int m_nbFadeSamples; float *m_fadeInSamples; float *m_fadeOutSamples; diff --git a/sdrbase/dsp/dspdevicesinkengine.cpp b/sdrbase/dsp/dspdevicesinkengine.cpp index dd65a9955..01cfd9c31 100644 --- a/sdrbase/dsp/dspdevicesinkengine.cpp +++ b/sdrbase/dsp/dspdevicesinkengine.cpp @@ -29,8 +29,8 @@ #include "threadedbasebandsamplesource.h" DSPDeviceSinkEngine::DSPDeviceSinkEngine(uint32_t uid, QObject* parent) : - m_uid(uid), QThread(parent), + m_uid(uid), m_state(StNotStarted), m_deviceSampleSink(0), m_sampleSinkSequence(0), diff --git a/sdrbase/dsp/dspdevicesourceengine.cpp b/sdrbase/dsp/dspdevicesourceengine.cpp index 4e257d34b..6d244d49c 100644 --- a/sdrbase/dsp/dspdevicesourceengine.cpp +++ b/sdrbase/dsp/dspdevicesourceengine.cpp @@ -27,8 +27,8 @@ #include "threadedbasebandsamplesink.h" DSPDeviceSourceEngine::DSPDeviceSourceEngine(uint uid, QObject* parent) : - m_uid(uid), QThread(parent), + m_uid(uid), m_state(StNotStarted), m_deviceSampleSource(0), m_sampleSourceSequence(0), diff --git a/sdrbase/dsp/filerecord.cpp b/sdrbase/dsp/filerecord.cpp index 3123ab2a7..b867dd385 100644 --- a/sdrbase/dsp/filerecord.cpp +++ b/sdrbase/dsp/filerecord.cpp @@ -42,7 +42,7 @@ void FileRecord::setFileName(const std::string& filename) } } -void FileRecord::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly) +void FileRecord::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused))) { // if no recording is active, send the samples to /dev/null if(!m_recordOn) diff --git a/sdrbase/dsp/interpolator.cpp b/sdrbase/dsp/interpolator.cpp index 7f4118973..a8ff5c88f 100644 --- a/sdrbase/dsp/interpolator.cpp +++ b/sdrbase/dsp/interpolator.cpp @@ -58,11 +58,11 @@ void Interpolator::createPolyphaseLowPass( Interpolator::Interpolator() : m_taps(0), m_alignedTaps(0), - m_nTaps(1), - m_ptr(0), m_taps2(0), m_alignedTaps2(0), - m_phaseSteps(1) + m_ptr(0), + m_phaseSteps(1), + m_nTaps(1) { } diff --git a/sdrbase/dsp/interpolators.h b/sdrbase/dsp/interpolators.h index 24f49a5b7..f1f3dd2d2 100644 --- a/sdrbase/dsp/interpolators.h +++ b/sdrbase/dsp/interpolators.h @@ -134,8 +134,6 @@ private: template void Interpolators::interpolate1(SampleVector::iterator* it, T* buf, qint32 len) { - qint32 xreal, yimag; - for (int pos = 0; pos < len - 1; pos += 2) { buf[pos+0] = (**it).m_real >> interpolation_shifts::post1; diff --git a/sdrbase/dsp/inthalfbandfiltereo1.h b/sdrbase/dsp/inthalfbandfiltereo1.h index a2b5067ef..cef06ea27 100644 --- a/sdrbase/dsp/inthalfbandfiltereo1.h +++ b/sdrbase/dsp/inthalfbandfiltereo1.h @@ -722,8 +722,8 @@ protected: qAcc += ((int32_t)m_even[1][m_ptr/2 + m_size/2 + 1]) << (HBFIRFilterTraits::hbShift - 1); } - sample->setReal(iAcc >> HBFIRFilterTraits::hbShift -1); - sample->setImag(qAcc >> HBFIRFilterTraits::hbShift -1); + sample->setReal(iAcc >> (HBFIRFilterTraits::hbShift -1)); + sample->setImag(qAcc >> (HBFIRFilterTraits::hbShift -1)); } void doFIR(int32_t *x, int32_t *y) diff --git a/sdrbase/dsp/nullsink.cpp b/sdrbase/dsp/nullsink.cpp index f6b4b697a..3537d4ff9 100644 --- a/sdrbase/dsp/nullsink.cpp +++ b/sdrbase/dsp/nullsink.cpp @@ -11,12 +11,12 @@ NullSink::~NullSink() { } -bool NullSink::init(const Message& message) +bool NullSink::init(const Message& message __attribute__((unused))) { return false; } -void NullSink::feed(SampleVector::const_iterator begin, SampleVector::const_iterator end, bool positiveOnly) +void NullSink::feed(SampleVector::const_iterator begin __attribute__((unused)), SampleVector::const_iterator end __attribute__((unused)), bool positiveOnly __attribute__((unused))) { } @@ -28,7 +28,7 @@ void NullSink::stop() { } -bool NullSink::handleMessage(const Message& message) +bool NullSink::handleMessage(const Message& message __attribute__((unused))) { return false; } diff --git a/sdrbase/dsp/phaselock.cpp b/sdrbase/dsp/phaselock.cpp index 8c214f71c..e6318fc97 100644 --- a/sdrbase/dsp/phaselock.cpp +++ b/sdrbase/dsp/phaselock.cpp @@ -249,7 +249,6 @@ void PhaseLock::process(const std::vector& samples_in, std::vector& // Process samples. Multiple output void PhaseLock::process(const Real& sample_in, Real *samples_out) { - bool was_locked = (m_lock_cnt >= m_lock_delay); m_pps_events.clear(); // Generate locked pilot tone. diff --git a/sdrbase/dsp/phaselock.h b/sdrbase/dsp/phaselock.h index 0d1b5e3e4..8547a4f82 100644 --- a/sdrbase/dsp/phaselock.h +++ b/sdrbase/dsp/phaselock.h @@ -93,7 +93,7 @@ protected: * Callback method to produce multiple outputs from the current phase value in m_phase * and/or the sin and cos values in m_psin and m_pcos */ - virtual void processPhase(Real *samples_out) const {}; + virtual void processPhase(Real *samples_out __attribute__((unused))) const {}; private: Real m_minfreq, m_maxfreq; diff --git a/sdrbase/dsp/scopevis.cpp b/sdrbase/dsp/scopevis.cpp index 830823cda..7050e122a 100644 --- a/sdrbase/dsp/scopevis.cpp +++ b/sdrbase/dsp/scopevis.cpp @@ -25,9 +25,9 @@ ScopeVis::ScopeVis(GLScope* glScope) : m_triggerIndex(0), m_prevTrigger(false), m_triggerPre(0), - m_triggerDelayCount(0), m_triggerOneShot(false), m_armed(false), + m_triggerDelayCount(0), m_triggerCount(0), m_sampleRate(0), m_prevArg(0.0), @@ -38,7 +38,7 @@ ScopeVis::ScopeVis(GLScope* glScope) : m_trace.resize(20*m_traceChunkSize); m_traceback.resize(20*m_traceChunkSize); - for (int i = 0; i < m_nbTriggers; i++) + for (unsigned int i = 0; i < m_nbTriggers; i++) { m_triggerChannel[i] = TriggerFreeRun; m_triggerLevel[i] = 0.0; @@ -55,9 +55,9 @@ ScopeVis::~ScopeVis() void ScopeVis::configure(MessageQueue* msgQueue, uint triggerIndex, - TriggerChannel triggerChannel, - Real triggerLevel, - bool triggerPositiveEdge, + TriggerChannel triggerChannel, + Real triggerLevel, + bool triggerPositiveEdge, bool triggerBothEdges, uint triggerPre, uint triggerDelay, @@ -76,7 +76,7 @@ void ScopeVis::configure(MessageQueue* msgQueue, msgQueue->push(cmd); } -void ScopeVis::feed(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool positiveOnly) +void ScopeVis::feed(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused))) { SampleVector::const_iterator begin(cbegin); @@ -144,7 +144,7 @@ void ScopeVis::feed(const SampleVector::const_iterator& cbegin, const SampleVect } begin += count; m_fill += count; - if(m_fill >= m_trace.size()) + if(m_fill >= m_trace.size()) { m_fill = 0; m_triggerDelayCount--; @@ -343,12 +343,12 @@ bool ScopeVis::triggerCondition(SampleVector::const_iterator& it) { Complex c(it->real()/32768.0f, it->imag()/32768.0f); m_traceback.push_back(c); // store into trace memory FIFO - + if (m_tracebackCount < m_traceback.size()) { // increment count up to trace memory size m_tracebackCount++; } - + if (m_triggerChannel[m_triggerIndex] == TriggerChannelI) { return c.real() > m_triggerLevel[m_triggerIndex]; diff --git a/sdrbase/dsp/scopevismulti.cpp b/sdrbase/dsp/scopevismulti.cpp index ddc7d1715..b7339e5f2 100644 --- a/sdrbase/dsp/scopevismulti.cpp +++ b/sdrbase/dsp/scopevismulti.cpp @@ -45,12 +45,12 @@ ScopeVisMulti::ScopeVisMulti(GLScopeMulti* glScope) : m_focusedTraceIndex(0), m_traceSize(m_traceChunkSize), m_nbSamples(0), + m_timeBase(1), + m_timeOfsProMill(0), m_traceStart(true), m_postTrigBuffering(false), m_traceFill(0), m_zTraceIndex(-1), - m_timeBase(1), - m_timeOfsProMill(0), m_sampleRate(0), m_freeRun(true), m_maxTraceDelay(0), @@ -296,7 +296,7 @@ void ScopeVisMulti::processSources() uint32_t nbSources = m_traceDiscreteMemory.getNbSources(); - for (int is = 0; is < nbSources; is++) + for (unsigned int is = 0; is < nbSources; is++) { SampleVector::iterator begin = m_traceDiscreteMemory.getBeginIterator(is); // trigger position SampleVector::iterator end = begin + m_traceSize; @@ -333,7 +333,7 @@ void ScopeVisMulti::processMemorySources() { uint32_t nbSources = m_traceDiscreteMemory.getNbSources(); - for (int is = 0; is < nbSources; is++) + for (unsigned int is = 0; is < nbSources; is++) { SampleVector::const_iterator mend = m_traceDiscreteMemory.m_traceBackBuffers[is].at(m_currentTraceMemoryIndex).m_endPoint; SampleVector::const_iterator mbegin = mend - m_traceSize; @@ -362,7 +362,12 @@ bool ScopeVisMulti::nextTrigger() } } - if (m_currentTriggerIndex < m_triggerConditions.size() - 1) // check if next trigger is available + if (m_triggerConditions.size() == 0) + { + m_currentTriggerIndex = 0; + return false; // final + } + else if (m_currentTriggerIndex < m_triggerConditions.size() - 1) // check if next trigger is available { m_currentTriggerIndex++; return true; // not final keep going @@ -375,11 +380,11 @@ bool ScopeVisMulti::nextTrigger() } } -void ScopeVisMulti::processTraces(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool traceBack, int sourceIndex) +void ScopeVisMulti::processTraces(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool traceBack, uint32_t sourceIndex) { SampleVector::const_iterator begin(cbegin); - int shift = (m_timeOfsProMill / 1000.0) * m_traceSize; - int length = m_traceSize / m_timeBase; + uint32_t shift = (m_timeOfsProMill / 1000.0) * m_traceSize; + uint32_t length = m_traceSize / m_timeBase; int nbSamples = end - begin; while (begin < end) @@ -402,7 +407,7 @@ void ScopeVisMulti::processTraces(const SampleVector::const_iterator& cbegin, co if (itCtl->m_traceCount[m_traces.currentBufferIndex()] < m_traceSize) { - int& traceCount = itCtl->m_traceCount[m_traces.currentBufferIndex()]; // reference for code clarity + uint32_t& traceCount = itCtl->m_traceCount[m_traces.currentBufferIndex()]; // reference for code clarity float v; if (projectionType == ProjectionMagLin) @@ -569,7 +574,7 @@ bool ScopeVisMulti::handleMessage(const Message& message) { QMutexLocker configLocker(&m_mutex); MsgScopeVisNGChangeTrigger& conf = (MsgScopeVisNGChangeTrigger&) message; - int triggerIndex = conf.getTriggerIndex(); + uint32_t triggerIndex = conf.getTriggerIndex(); if (triggerIndex < m_triggerConditions.size()) { @@ -589,7 +594,7 @@ bool ScopeVisMulti::handleMessage(const Message& message) { QMutexLocker configLocker(&m_mutex); MsgScopeVisNGRemoveTrigger& conf = (MsgScopeVisNGRemoveTrigger&) message; - int triggerIndex = conf.getTriggerIndex(); + uint32_t triggerIndex = conf.getTriggerIndex(); if (triggerIndex < m_triggerConditions.size()) { m_triggerConditions.erase(m_triggerConditions.begin() + triggerIndex); @@ -622,7 +627,7 @@ bool ScopeVisMulti::handleMessage(const Message& message) else if (MsgScopeVisNGFocusOnTrigger::match(message)) { MsgScopeVisNGFocusOnTrigger& conf = (MsgScopeVisNGFocusOnTrigger&) message; - int triggerIndex = conf.getTriggerIndex(); + uint32_t triggerIndex = conf.getTriggerIndex(); if (triggerIndex < m_triggerConditions.size()) { @@ -679,7 +684,7 @@ bool ScopeVisMulti::handleMessage(const Message& message) else if (MsgScopeVisNGFocusOnTrace::match(message)) { MsgScopeVisNGFocusOnTrace& conf = (MsgScopeVisNGFocusOnTrace&) message; - int traceIndex = conf.getTraceIndex(); + uint32_t traceIndex = conf.getTraceIndex(); if (traceIndex < m_traces.m_tracesData.size()) { @@ -772,7 +777,7 @@ void ScopeVisMulti::initTraceBuffers() for (; it0 != m_traces.m_traces[0].end(); ++it0, ++it1) { - for (int i = 0; i < m_traceSize; i++) + for (unsigned int i = 0; i < m_traceSize; i++) { (*it0)[2*i] = (i - shift); // display x (*it0)[2*i + 1] = 0.0f; // display y diff --git a/sdrbase/dsp/scopevismulti.h b/sdrbase/dsp/scopevismulti.h index 3dcbc167c..9c1c83427 100644 --- a/sdrbase/dsp/scopevismulti.h +++ b/sdrbase/dsp/scopevismulti.h @@ -783,7 +783,7 @@ private: /** * Return the minimum number of samples in buffer */ - int minFill() const + uint32_t minFill() const { return *std::min_element(m_sourceFill.begin(), m_sourceFill.end()); } @@ -835,11 +835,11 @@ private: */ struct TraceControl { - Projector m_projector; //!< Projector transform from complex trace to real (displayable) trace - int m_traceCount[2]; //!< Count of samples processed (double buffered) - Real m_maxPow; //!< Maximum power over the current trace for MagDB overlay display - Real m_sumPow; //!< Cumulative power over the current trace for MagDB overlay display - int m_nbPow; //!< Number of power samples over the current trace for MagDB overlay display + Projector m_projector; //!< Projector transform from complex trace to real (displayable) trace + uint32_t m_traceCount[2]; //!< Count of samples processed (double buffered) + Real m_maxPow; //!< Maximum power over the current trace for MagDB overlay display + Real m_sumPow; //!< Cumulative power over the current trace for MagDB overlay display + int m_nbPow; //!< Number of power samples over the current trace for MagDB overlay display TraceControl() : m_projector(ProjectionReal) { @@ -878,7 +878,12 @@ private: int m_maxTraceSize; //!< Maximum Size of a trace in buffer bool evenOddIndex; //!< Even (true) or odd (false) index - Traces() : evenOddIndex(true), m_traceSize(0), m_maxTraceSize(0), m_x0(0), m_x1(0) + Traces() : + m_traceSize(0), + m_maxTraceSize(0), + evenOddIndex(true), + m_x0(0), + m_x1(0) { } @@ -975,7 +980,7 @@ private: std::fill_n(m_x0, 2*m_traceSize*m_traces[0].size(), 0.0f); std::fill_n(m_x1, 2*m_traceSize*m_traces[0].size(), 0.0f); - for (int i = 0; i < m_traces[0].size(); i++) + for (unsigned int i = 0; i < m_traces[0].size(); i++) { (m_traces[0])[i] = &m_x0[2*m_traceSize*i]; (m_traces[1])[i] = &m_x1[2*m_traceSize*i]; @@ -1076,15 +1081,15 @@ private: GLScopeMulti* m_glScope; uint32_t m_preTriggerDelay; //!< Pre-trigger delay in number of samples std::vector m_triggerConditions; //!< Chain of triggers - int m_currentTriggerIndex; //!< Index of current index in the chain - int m_focusedTriggerIndex; //!< Index of the trigger that has focus + uint32_t m_currentTriggerIndex; //!< Index of current index in the chain + uint32_t m_focusedTriggerIndex; //!< Index of the trigger that has focus TriggerState m_triggerState; //!< Current trigger state Traces m_traces; //!< Displayable traces int m_focusedTraceIndex; //!< Index of the trace that has focus - int m_traceSize; //!< Size of traces in number of samples + uint32_t m_traceSize; //!< Size of traces in number of samples int m_nbSamples; //!< Number of samples yet to process in one complex trace - int m_timeBase; //!< Trace display time divisor - int m_timeOfsProMill; //!< Start trace shift in 1/1000 trace size + uint32_t m_timeBase; //!< Trace display time divisor + uint32_t m_timeOfsProMill; //!< Start trace shift in 1/1000 trace size bool m_traceStart; //!< Trace is at start point bool m_postTrigBuffering; //!< Buffering after trigger match to get enough samples for the display traces int m_traceFill; //!< Count of samples accumulated into trace @@ -1125,7 +1130,7 @@ private: * - if finished it returns the number of unprocessed samples left in the buffer * - if not finished it returns -1 */ - void processTraces(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool traceBack, int sourceIndex); + void processTraces(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool traceBack, uint32_t sourceIndex); /** * Get maximum trace delay diff --git a/sdrbase/dsp/scopevisng.cpp b/sdrbase/dsp/scopevisng.cpp index bb09fc27d..4e7d87956 100644 --- a/sdrbase/dsp/scopevisng.cpp +++ b/sdrbase/dsp/scopevisng.cpp @@ -48,11 +48,11 @@ ScopeVisNG::ScopeVisNG(GLScopeNG* glScope) : m_focusedTraceIndex(0), m_traceSize(m_traceChunkSize), m_nbSamples(0), + m_timeBase(1), + m_timeOfsProMill(0), m_traceStart(true), m_traceFill(0), m_zTraceIndex(-1), - m_timeBase(1), - m_timeOfsProMill(0), m_sampleRate(0), m_traceDiscreteMemory(m_nbTraceMemories), m_freeRun(true), @@ -171,7 +171,7 @@ void ScopeVisNG::setMemoryIndex(uint32_t memoryIndex) getInputMessageQueue()->push(cmd); } -void ScopeVisNG::feed(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool positiveOnly) +void ScopeVisNG::feed(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused))) { if (m_freeRun) { m_triggerPoint = cbegin; @@ -412,7 +412,12 @@ bool ScopeVisNG::nextTrigger() } } - if (m_currentTriggerIndex < m_triggerConditions.size() - 1) // check if next trigger is available + if (m_triggerConditions.size() == 0) + { + m_currentTriggerIndex = 0; + return false; // final + } + else if (m_currentTriggerIndex < m_triggerConditions.size() - 1) // check if next trigger is available { m_currentTriggerIndex++; return true; // not final keep going @@ -428,8 +433,8 @@ bool ScopeVisNG::nextTrigger() int ScopeVisNG::processTraces(const SampleVector::const_iterator& cbegin, const SampleVector::const_iterator& end, bool traceBack) { SampleVector::const_iterator begin(cbegin); - int shift = (m_timeOfsProMill / 1000.0) * m_traceSize; - int length = m_traceSize / m_timeBase; + uint32_t shift = (m_timeOfsProMill / 1000.0) * m_traceSize; + uint32_t length = m_traceSize / m_timeBase; while ((begin < end) && (m_nbSamples > 0)) { @@ -447,7 +452,7 @@ int ScopeVisNG::processTraces(const SampleVector::const_iterator& cbegin, const if (itCtl->m_traceCount[m_traces.currentBufferIndex()] < m_traceSize) { - int& traceCount = itCtl->m_traceCount[m_traces.currentBufferIndex()]; // reference for code clarity + uint32_t& traceCount = itCtl->m_traceCount[m_traces.currentBufferIndex()]; // reference for code clarity float v; if (projectionType == ProjectionMagLin) @@ -622,7 +627,7 @@ bool ScopeVisNG::handleMessage(const Message& message) { QMutexLocker configLocker(&m_mutex); MsgScopeVisNGChangeTrigger& conf = (MsgScopeVisNGChangeTrigger&) message; - int triggerIndex = conf.getTriggerIndex(); + uint32_t triggerIndex = conf.getTriggerIndex(); if (triggerIndex < m_triggerConditions.size()) { @@ -642,7 +647,7 @@ bool ScopeVisNG::handleMessage(const Message& message) { QMutexLocker configLocker(&m_mutex); MsgScopeVisNGRemoveTrigger& conf = (MsgScopeVisNGRemoveTrigger&) message; - int triggerIndex = conf.getTriggerIndex(); + uint32_t triggerIndex = conf.getTriggerIndex(); if (triggerIndex < m_triggerConditions.size()) { m_triggerConditions.erase(m_triggerConditions.begin() + triggerIndex); @@ -675,7 +680,7 @@ bool ScopeVisNG::handleMessage(const Message& message) else if (MsgScopeVisNGFocusOnTrigger::match(message)) { MsgScopeVisNGFocusOnTrigger& conf = (MsgScopeVisNGFocusOnTrigger&) message; - int triggerIndex = conf.getTriggerIndex(); + uint32_t triggerIndex = conf.getTriggerIndex(); if (triggerIndex < m_triggerConditions.size()) { @@ -732,7 +737,7 @@ bool ScopeVisNG::handleMessage(const Message& message) else if (MsgScopeVisNGFocusOnTrace::match(message)) { MsgScopeVisNGFocusOnTrace& conf = (MsgScopeVisNGFocusOnTrace&) message; - int traceIndex = conf.getTraceIndex(); + uint32_t traceIndex = conf.getTraceIndex(); if (traceIndex < m_traces.m_tracesData.size()) { @@ -825,7 +830,7 @@ void ScopeVisNG::initTraceBuffers() for (; it0 != m_traces.m_traces[0].end(); ++it0, ++it1) { - for (int i = 0; i < m_traceSize; i++) + for (unsigned int i = 0; i < m_traceSize; i++) { (*it0)[2*i] = (i - shift); // display x (*it0)[2*i + 1] = 0.0f; // display y diff --git a/sdrbase/dsp/scopevisng.h b/sdrbase/dsp/scopevisng.h index 902a319b0..27ef8963e 100644 --- a/sdrbase/dsp/scopevisng.h +++ b/sdrbase/dsp/scopevisng.h @@ -771,11 +771,11 @@ private: */ struct TraceControl { - Projector m_projector; //!< Projector transform from complex trace to real (displayable) trace - int m_traceCount[2]; //!< Count of samples processed (double buffered) - Real m_maxPow; //!< Maximum power over the current trace for MagDB overlay display - Real m_sumPow; //!< Cumulative power over the current trace for MagDB overlay display - int m_nbPow; //!< Number of power samples over the current trace for MagDB overlay display + Projector m_projector; //!< Projector transform from complex trace to real (displayable) trace + uint32_t m_traceCount[2]; //!< Count of samples processed (double buffered) + Real m_maxPow; //!< Maximum power over the current trace for MagDB overlay display + Real m_sumPow; //!< Cumulative power over the current trace for MagDB overlay display + int m_nbPow; //!< Number of power samples over the current trace for MagDB overlay display TraceControl() : m_projector(ProjectionReal) { @@ -814,7 +814,12 @@ private: int m_maxTraceSize; //!< Maximum Size of a trace in buffer bool evenOddIndex; //!< Even (true) or odd (false) index - Traces() : evenOddIndex(true), m_traceSize(0), m_maxTraceSize(0), m_x0(0), m_x1(0) + Traces() : + m_traceSize(0), + m_maxTraceSize(0), + evenOddIndex(true), + m_x0(0), + m_x1(0) { } @@ -911,7 +916,7 @@ private: std::fill_n(m_x0, 2*m_traceSize*m_traces[0].size(), 0.0f); std::fill_n(m_x1, 2*m_traceSize*m_traces[0].size(), 0.0f); - for (int i = 0; i < m_traces[0].size(); i++) + for (unsigned int i = 0; i < m_traces[0].size(); i++) { (m_traces[0])[i] = &m_x0[2*m_traceSize*i]; (m_traces[1])[i] = &m_x1[2*m_traceSize*i]; @@ -1010,15 +1015,15 @@ private: GLScopeNG* m_glScope; uint32_t m_preTriggerDelay; //!< Pre-trigger delay in number of samples std::vector m_triggerConditions; //!< Chain of triggers - int m_currentTriggerIndex; //!< Index of current index in the chain - int m_focusedTriggerIndex; //!< Index of the trigger that has focus + uint32_t m_currentTriggerIndex; //!< Index of current index in the chain + uint32_t m_focusedTriggerIndex; //!< Index of the trigger that has focus TriggerState m_triggerState; //!< Current trigger state Traces m_traces; //!< Displayable traces int m_focusedTraceIndex; //!< Index of the trace that has focus - int m_traceSize; //!< Size of traces in number of samples + uint32_t m_traceSize; //!< Size of traces in number of samples int m_nbSamples; //!< Number of samples yet to process in one complex trace - int m_timeBase; //!< Trace display time divisor - int m_timeOfsProMill; //!< Start trace shift in 1/1000 trace size + uint32_t m_timeBase; //!< Trace display time divisor + uint32_t m_timeOfsProMill; //!< Start trace shift in 1/1000 trace size bool m_traceStart; //!< Trace is at start point int m_traceFill; //!< Count of samples accumulated into trace int m_zTraceIndex; //!< Index of the trace used for Z input (luminance or false colors) diff --git a/sdrbase/dsp/spectrumscopecombovis.cpp b/sdrbase/dsp/spectrumscopecombovis.cpp index 8b5352303..feb482022 100644 --- a/sdrbase/dsp/spectrumscopecombovis.cpp +++ b/sdrbase/dsp/spectrumscopecombovis.cpp @@ -13,11 +13,11 @@ SpectrumScopeComboVis::~SpectrumScopeComboVis() { } -void SpectrumScopeComboVis::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly) +void SpectrumScopeComboVis::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused))) { m_scopeVis->feed(begin, end, false); SampleVector::const_iterator triggerPoint = m_scopeVis->getTriggerPoint(); - m_spectrumVis->feedTriggered(triggerPoint, begin, end, positiveOnly); + m_spectrumVis->feedTriggered(triggerPoint, end, positiveOnly); } void SpectrumScopeComboVis::start() diff --git a/sdrbase/dsp/spectrumscopengcombovis.cpp b/sdrbase/dsp/spectrumscopengcombovis.cpp index ff5f5402c..01e23b76f 100644 --- a/sdrbase/dsp/spectrumscopengcombovis.cpp +++ b/sdrbase/dsp/spectrumscopengcombovis.cpp @@ -13,11 +13,11 @@ SpectrumScopeNGComboVis::~SpectrumScopeNGComboVis() { } -void SpectrumScopeNGComboVis::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly) +void SpectrumScopeNGComboVis::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly __attribute__((unused))) { m_scopeVis->feed(begin, end, false); SampleVector::const_iterator triggerPoint = m_scopeVis->getTriggerPoint(); - m_spectrumVis->feedTriggered(triggerPoint, begin, end, positiveOnly); + m_spectrumVis->feedTriggered(triggerPoint, end, positiveOnly); } void SpectrumScopeNGComboVis::start() diff --git a/sdrbase/dsp/spectrumvis.cpp b/sdrbase/dsp/spectrumvis.cpp index 9c3d67773..5489c0965 100644 --- a/sdrbase/dsp/spectrumvis.cpp +++ b/sdrbase/dsp/spectrumvis.cpp @@ -39,7 +39,7 @@ void SpectrumVis::configure(MessageQueue* msgQueue, int fftSize, int overlapPerc msgQueue->push(cmd); } -void SpectrumVis::feedTriggered(const SampleVector::const_iterator& triggerPoint, const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly) +void SpectrumVis::feedTriggered(const SampleVector::const_iterator& triggerPoint, const SampleVector::const_iterator& end, bool positiveOnly) { feed(triggerPoint, end, positiveOnly); // normal feed from trigger point /* diff --git a/sdrbase/dsp/spectrumvis.h b/sdrbase/dsp/spectrumvis.h index 196858b5d..854c89970 100644 --- a/sdrbase/dsp/spectrumvis.h +++ b/sdrbase/dsp/spectrumvis.h @@ -41,7 +41,7 @@ public: void configure(MessageQueue* msgQueue, int fftSize, int overlapPercent, FFTWindow::Function window); virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly); - void feedTriggered(const SampleVector::const_iterator& triggerPoint, const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly); + void feedTriggered(const SampleVector::const_iterator& triggerPoint, const SampleVector::const_iterator& end, bool positiveOnly); virtual void start(); virtual void stop(); virtual bool handleMessage(const Message& message); diff --git a/sdrbase/dsp/threadedbasebandsamplesink.cpp b/sdrbase/dsp/threadedbasebandsamplesink.cpp index 4efde17fa..751e2ce19 100644 --- a/sdrbase/dsp/threadedbasebandsamplesink.cpp +++ b/sdrbase/dsp/threadedbasebandsamplesink.cpp @@ -104,7 +104,7 @@ void ThreadedBasebandSampleSink::stop() m_thread->wait(); } -void ThreadedBasebandSampleSink::feed(SampleVector::const_iterator begin, SampleVector::const_iterator end, bool positiveOnly) +void ThreadedBasebandSampleSink::feed(SampleVector::const_iterator begin, SampleVector::const_iterator end, bool positiveOnly __attribute__((unused))) { //m_sampleSink->feed(begin, end, positiveOnly); //m_sampleFifo.write(begin, end); diff --git a/sdrbase/gui/clickablelabel.cpp b/sdrbase/gui/clickablelabel.cpp index 6d7c7c360..2a735f39c 100644 --- a/sdrbase/gui/clickablelabel.cpp +++ b/sdrbase/gui/clickablelabel.cpp @@ -32,7 +32,7 @@ ClickableLabel::~ClickableLabel() { } -void ClickableLabel::mousePressEvent(QMouseEvent* event) +void ClickableLabel::mousePressEvent(QMouseEvent* event __attribute__((unused))) { emit clicked(); } diff --git a/sdrbase/gui/cwkeyergui.cpp b/sdrbase/gui/cwkeyergui.cpp index 1c259d68e..358ad141e 100644 --- a/sdrbase/gui/cwkeyergui.cpp +++ b/sdrbase/gui/cwkeyergui.cpp @@ -92,7 +92,7 @@ bool CWKeyerGUI::deserialize(const QByteArray& data) // === SLOTS ================================================================== -void CWKeyerGUI::on_cwTextClear_clicked(bool checked) +void CWKeyerGUI::on_cwTextClear_clicked(bool checked __attribute__((unused))) { ui->cwTextEdit->clear(); m_cwKeyer->setText(""); diff --git a/sdrbase/gui/glscope.cpp b/sdrbase/gui/glscope.cpp index c3c477b98..5f3f26c6b 100644 --- a/sdrbase/gui/glscope.cpp +++ b/sdrbase/gui/glscope.cpp @@ -47,28 +47,28 @@ GLScope::GLScope(QWidget* parent) : m_memTraceIndexMax(0), m_memTraceRecall(false), m_displayTrace(&m_rawTrace[0]), - m_oldTraceSize(-1), - m_sampleRate(0), - m_amp1(1.0), - m_amp2(1.0), - m_ofs1(0.0), - m_ofs2(0.0), //m_amp(1.0), //m_ofs(0.0), - m_timeBase(1), - m_timeOfsProMill(0), - m_triggerChannel(ScopeVis::TriggerFreeRun), - m_triggerLevel(0.0), - m_triggerPre(0.0), - m_triggerLevelDis1(0.0), - m_triggerLevelDis2(0.0), - m_prevArg(0), - m_displayGridIntensity(5), - m_displayTraceIntensity(50), - m_powerOverlayFont(font()), m_maxPow(0.0f), m_sumPow(0.0f), - m_nbPow(1) + m_oldTraceSize(-1), + m_sampleRate(0), + m_amp1(1.0), + m_amp2(1.0), + m_ofs1(0.0), + m_ofs2(0.0), + m_timeBase(1), + m_timeOfsProMill(0), + m_triggerChannel(ScopeVis::TriggerFreeRun), + m_triggerLevel(0.0), + m_triggerPre(0.0), + m_triggerLevelDis1(0.0), + m_triggerLevelDis2(0.0), + m_nbPow(1), + m_prevArg(0), + m_displayGridIntensity(5), + m_displayTraceIntensity(50), + m_powerOverlayFont(font()) { setAttribute(Qt::WA_OpaquePaintEvent); connect(&m_timer, SIGNAL(timeout()), this, SLOT(tick())); @@ -839,7 +839,7 @@ void GLScope::paintGL() m_mutex.unlock(); } -void GLScope::mousePressEvent(QMouseEvent* event) +void GLScope::mousePressEvent(QMouseEvent* event __attribute__((unused))) { #if 0 int x = event->x() - 10; diff --git a/sdrbase/gui/glscopegui.cpp b/sdrbase/gui/glscopegui.cpp index 40715445f..777aed8c6 100644 --- a/sdrbase/gui/glscopegui.cpp +++ b/sdrbase/gui/glscopegui.cpp @@ -33,7 +33,7 @@ GLScopeGUI::GLScopeGUI(QWidget* parent) : m_triggerPre(0), m_traceLenMult(20) { - for (int i = 0; i < ScopeVis::m_nbTriggers; i++) + for (unsigned int i = 0; i < ScopeVis::m_nbTriggers; i++) { m_triggerChannel[i] = ScopeVis::TriggerFreeRun; m_triggerLevelCoarse[i] = 0; @@ -84,7 +84,7 @@ void GLScopeGUI::resetToDefaults() m_triggerPre = 0; m_traceLenMult = 20; - for (int i = 0; i < ScopeVis::m_nbTriggers; i++) + for (unsigned int i = 0; i < ScopeVis::m_nbTriggers; i++) { m_triggerChannel[i] = ScopeVis::TriggerFreeRun; m_triggerLevelCoarse[i] = 0; @@ -118,7 +118,7 @@ QByteArray GLScopeGUI::serialize() const s.writeS32(20, m_amp2OffsetCoarse); s.writeS32(21, m_amp2OffsetFine); - for (int i = 0; i < ScopeVis::m_nbTriggers; i++) + for (unsigned int i = 0; i < ScopeVis::m_nbTriggers; i++) { s.writeS32(50 + 10*i, m_triggerChannel[i]); s.writeS32(51 + 10*i, m_triggerLevelCoarse[i]); @@ -165,7 +165,7 @@ bool GLScopeGUI::deserialize(const QByteArray& data) d.readS32(20, &m_amp2OffsetCoarse, 0); d.readS32(21, &m_amp2OffsetFine, 0); - for (int i = 0; i < ScopeVis::m_nbTriggers; i++) + for (unsigned int i = 0; i < ScopeVis::m_nbTriggers; i++) { d.readS32(50 + 10*i, &m_triggerChannel[i], ScopeVis::TriggerFreeRun); d.readS32(51 + 10*i, &m_triggerLevelCoarse[i], 0); @@ -194,7 +194,7 @@ void GLScopeGUI::applyAllTriggerSettings() { quint32 currentTriggerIndex = m_triggerIndex; - for (int i = 0; i < ScopeVis::m_nbTriggers; i++) + for (unsigned int i = 0; i < ScopeVis::m_nbTriggers; i++) { m_triggerIndex = i; applyTriggerSettings(); @@ -899,7 +899,7 @@ void GLScopeGUI::on_oneShot_clicked() m_scopeVis->setOneShot(ui->oneShot->isChecked()); } -bool GLScopeGUI::handleMessage(Message* cmd) +bool GLScopeGUI::handleMessage(Message* cmd __attribute__((unused))) { return false; /* diff --git a/sdrbase/gui/glscopemulti.cpp b/sdrbase/gui/glscopemulti.cpp index ffa81869a..e78a288a4 100644 --- a/sdrbase/gui/glscopemulti.cpp +++ b/sdrbase/gui/glscopemulti.cpp @@ -34,15 +34,15 @@ GLScopeMulti::GLScopeMulti(QWidget* parent) : m_displayMode(DisplayX), m_dataChanged(false), m_configChanged(false), - m_displayGridIntensity(10), - m_displayTraceIntensity(50), - m_timeBase(1), - m_traceSize(0), m_sampleRate(0), - m_triggerPre(0), m_timeOfsProMill(0), + m_triggerPre(0), + m_traceSize(0), + m_timeBase(1), + m_timeOffset(0), m_focusedTraceIndex(0), - m_timeOffset(0) + m_displayGridIntensity(10), + m_displayTraceIntensity(50) { setAttribute(Qt::WA_OpaquePaintEvent); connect(&m_timer, SIGNAL(timeout()), this, SLOT(tick())); @@ -479,7 +479,7 @@ void GLScopeMulti::paintGL() if(end - start < 2) start--; - for (int i = 1; i < m_traces->size(); i++) + for (unsigned int i = 1; i < m_traces->size(); i++) { const float *trace = (*m_traces)[i]; const ScopeVisMulti::TraceData& traceData = (*m_tracesData)[i]; @@ -702,7 +702,7 @@ void GLScopeMulti::paintGL() if(end - start < 2) start--; - for (int i = 0; i < m_traces->size(); i++) + for (unsigned int i = 0; i < m_traces->size(); i++) { const float *trace = (*m_traces)[i]; const ScopeVisMulti::TraceData& traceData = (*m_tracesData)[i]; @@ -875,7 +875,7 @@ void GLScopeMulti::paintGL() const float *trace0 = (*m_traces)[0]; memcpy(q3, &(trace0[2*start+1]), (2*(end - start) - 1)*sizeof(float)); // copy X values - for (int i = 1; i < m_traces->size(); i++) + for (unsigned int i = 1; i < m_traces->size(); i++) { const float *trace = (*m_traces)[i]; const ScopeVisMulti::TraceData& traceData = (*m_tracesData)[i]; @@ -969,7 +969,6 @@ void GLScopeMulti::applyConfig() m_configChanged = false; QFontMetrics fm(font()); - int M = fm.width("-"); //float t_start = ((m_timeOfsProMill / 1000.0) * ((float) m_traceSize / m_sampleRate)) - ((float) m_triggerPre / m_sampleRate); float t_start = (((m_timeOfsProMill / 1000.0f) * (float) m_traceSize) / m_sampleRate) - ((float) m_triggerPre / m_sampleRate); float t_len = ((float) m_traceSize / m_sampleRate) / (float) m_timeBase; diff --git a/sdrbase/gui/glscopemultigui.cpp b/sdrbase/gui/glscopemultigui.cpp index 02d49e1c1..56cf93de3 100644 --- a/sdrbase/gui/glscopemultigui.cpp +++ b/sdrbase/gui/glscopemultigui.cpp @@ -28,12 +28,12 @@ GLScopeMultiGUI::GLScopeMultiGUI(QWidget* parent) : QWidget(parent), ui(new Ui::GLScopeMultiGUI), m_messageQueue(0), - m_glScope(0), m_scopeVis(0), + m_glScope(0), m_sampleRate(0), - m_traceLenMult(1), m_timeBase(1), - m_timeOffset(0) + m_timeOffset(0), + m_traceLenMult(1) { qDebug("GLScopeMultiGUI::GLScopeMultiGUI"); setEnabled(false); @@ -181,7 +181,7 @@ QByteArray GLScopeMultiGUI::serialize() const s.writeU32(200, (uint32_t) m_scopeVis->getNbTriggers()); s.writeS32(201, ui->trigPre->value()); - for (int i = 0; i < m_scopeVis->getNbTriggers(); i++) + for (unsigned int i = 0; i < m_scopeVis->getNbTriggers(); i++) { const ScopeVisMulti::TriggerData& triggerData = m_scopeVis->getTriggerData(i); s.writeS32(210 + 16*i, (int) triggerData.m_projectionType); @@ -270,7 +270,7 @@ bool GLScopeMultiGUI::deserialize(const QByteArray& data) uint32_t nbTracesSaved; d.readU32(10, &nbTracesSaved, 1); const std::vector& tracesData = m_scopeVis->getTracesData(); - int iTrace = tracesData.size(); + uint32_t iTrace = tracesData.size(); qDebug("GLScopeMultiGUI::deserialize: nbTracesSaved: %u tracesData.size(): %lu", nbTracesSaved, tracesData.size()); @@ -339,7 +339,7 @@ bool GLScopeMultiGUI::deserialize(const QByteArray& data) uint32_t nbTriggersSaved; d.readU32(200, &nbTriggersSaved, 1); uint32_t nbTriggers = m_scopeVis->getNbTriggers(); - int iTrigger = nbTriggers; + uint32_t iTrigger = nbTriggers; d.readS32(201, &intValue, 0); ui->trigPre->setValue(intValue); @@ -558,14 +558,14 @@ void GLScopeMultiGUI::on_trace_valueChanged(int value) m_scopeVis->focusOnTrace(value); } -void GLScopeMultiGUI::on_traceAdd_clicked(bool checked) +void GLScopeMultiGUI::on_traceAdd_clicked(bool checked __attribute__((unused))) { ScopeVisMulti::TraceData traceData; fillTraceData(traceData); addTrace(traceData); } -void GLScopeMultiGUI::on_traceDel_clicked(bool checked) +void GLScopeMultiGUI::on_traceDel_clicked(bool checked __attribute__((unused))) { if (ui->trace->value() > 0) // not the X trace { @@ -586,7 +586,7 @@ void GLScopeMultiGUI::on_traceDel_clicked(bool checked) } } -void GLScopeMultiGUI::on_traceUp_clicked(bool checked) +void GLScopeMultiGUI::on_traceUp_clicked(bool checked __attribute__((unused))) { if (ui->trace->maximum() > 0) // more than one trace { @@ -600,7 +600,7 @@ void GLScopeMultiGUI::on_traceUp_clicked(bool checked) } } -void GLScopeMultiGUI::on_traceDown_clicked(bool checked) +void GLScopeMultiGUI::on_traceDown_clicked(bool checked __attribute__((unused))) { if (ui->trace->value() > 0) // not the X (lowest) trace { @@ -633,14 +633,14 @@ void GLScopeMultiGUI::on_trig_valueChanged(int value) m_scopeVis->focusOnTrigger(value); } -void GLScopeMultiGUI::on_trigAdd_clicked(bool checked) +void GLScopeMultiGUI::on_trigAdd_clicked(bool checked __attribute__((unused))) { ScopeVisMulti::TriggerData triggerData; fillTriggerData(triggerData); addTrigger(triggerData); } -void GLScopeMultiGUI::on_trigDel_clicked(bool checked) +void GLScopeMultiGUI::on_trigDel_clicked(bool checked __attribute__((unused))) { if (ui->trig->value() > 0) { @@ -649,7 +649,7 @@ void GLScopeMultiGUI::on_trigDel_clicked(bool checked) } } -void GLScopeMultiGUI::on_trigUp_clicked(bool checked) +void GLScopeMultiGUI::on_trigUp_clicked(bool checked __attribute__((unused))) { if (ui->trig->maximum() > 0) // more than one trigger { @@ -663,7 +663,7 @@ void GLScopeMultiGUI::on_trigUp_clicked(bool checked) } } -void GLScopeMultiGUI::on_trigDown_clicked(bool checked) +void GLScopeMultiGUI::on_trigDown_clicked(bool checked __attribute__((unused))) { if (ui->trig->value() > 0) // not the 0 (lowest) trigger { @@ -677,44 +677,44 @@ void GLScopeMultiGUI::on_trigDown_clicked(bool checked) } } -void GLScopeMultiGUI::on_traceMode_currentIndexChanged(int index) +void GLScopeMultiGUI::on_traceMode_currentIndexChanged(int index __attribute__((unused))) { setAmpScaleDisplay(); setAmpOfsDisplay(); changeCurrentTrace(); } -void GLScopeMultiGUI::on_amp_valueChanged(int value) +void GLScopeMultiGUI::on_amp_valueChanged(int value __attribute__((unused))) { setAmpScaleDisplay(); changeCurrentTrace(); } -void GLScopeMultiGUI::on_ofsCoarse_valueChanged(int value) +void GLScopeMultiGUI::on_ofsCoarse_valueChanged(int value __attribute__((unused))) { setAmpOfsDisplay(); changeCurrentTrace(); } -void GLScopeMultiGUI::on_ofsFine_valueChanged(int value) +void GLScopeMultiGUI::on_ofsFine_valueChanged(int value __attribute__((unused))) { setAmpOfsDisplay(); changeCurrentTrace(); } -void GLScopeMultiGUI::on_traceDelayCoarse_valueChanged(int value) +void GLScopeMultiGUI::on_traceDelayCoarse_valueChanged(int value __attribute__((unused))) { setTraceDelayDisplay(); changeCurrentTrace(); } -void GLScopeMultiGUI::on_traceDelayFine_valueChanged(int value) +void GLScopeMultiGUI::on_traceDelayFine_valueChanged(int value __attribute__((unused))) { setTraceDelayDisplay(); changeCurrentTrace(); } -void GLScopeMultiGUI::on_traceView_toggled(bool checked) +void GLScopeMultiGUI::on_traceView_toggled(bool checked __attribute__((unused))) { changeCurrentTrace(); } @@ -742,13 +742,13 @@ void GLScopeMultiGUI::on_mem_valueChanged(int value) m_scopeVis->setMemoryIndex(value); } -void GLScopeMultiGUI::on_trigMode_currentIndexChanged(int index) +void GLScopeMultiGUI::on_trigMode_currentIndexChanged(int index __attribute__((unused))) { setTrigLevelDisplay(); changeCurrentTrigger(); } -void GLScopeMultiGUI::on_trigCount_valueChanged(int value) +void GLScopeMultiGUI::on_trigCount_valueChanged(int value __attribute__((unused))) { setTrigCountDisplay(); changeCurrentTrigger(); @@ -784,31 +784,31 @@ void GLScopeMultiGUI::on_trigBoth_toggled(bool checked) changeCurrentTrigger(); } -void GLScopeMultiGUI::on_trigLevelCoarse_valueChanged(int value) +void GLScopeMultiGUI::on_trigLevelCoarse_valueChanged(int value __attribute__((unused))) { setTrigLevelDisplay(); changeCurrentTrigger(); } -void GLScopeMultiGUI::on_trigLevelFine_valueChanged(int value) +void GLScopeMultiGUI::on_trigLevelFine_valueChanged(int value __attribute__((unused))) { setTrigLevelDisplay(); changeCurrentTrigger(); } -void GLScopeMultiGUI::on_trigDelayCoarse_valueChanged(int value) +void GLScopeMultiGUI::on_trigDelayCoarse_valueChanged(int value __attribute__((unused))) { setTrigDelayDisplay(); changeCurrentTrigger(); } -void GLScopeMultiGUI::on_trigDelayFine_valueChanged(int value) +void GLScopeMultiGUI::on_trigDelayFine_valueChanged(int value __attribute__((unused))) { setTrigDelayDisplay(); changeCurrentTrigger(); } -void GLScopeMultiGUI::on_trigPre_valueChanged(int value) +void GLScopeMultiGUI::on_trigPre_valueChanged(int value __attribute__((unused))) { setTrigPreDisplay(); m_scopeVis->configure( @@ -1307,7 +1307,7 @@ void GLScopeMultiGUI::applySettings() { } -bool GLScopeMultiGUI::handleMessage(Message* message) +bool GLScopeMultiGUI::handleMessage(Message* message __attribute__((unused))) { return false; } diff --git a/sdrbase/gui/glscopeng.cpp b/sdrbase/gui/glscopeng.cpp index d2b030066..642b68a07 100644 --- a/sdrbase/gui/glscopeng.cpp +++ b/sdrbase/gui/glscopeng.cpp @@ -34,15 +34,15 @@ GLScopeNG::GLScopeNG(QWidget* parent) : m_displayMode(DisplayX), m_dataChanged(false), m_configChanged(false), - m_displayGridIntensity(10), - m_displayTraceIntensity(50), - m_timeBase(1), - m_traceSize(0), m_sampleRate(0), - m_triggerPre(0), m_timeOfsProMill(0), + m_triggerPre(0), + m_traceSize(0), + m_timeBase(1), + m_timeOffset(0), m_focusedTraceIndex(0), - m_timeOffset(0) + m_displayGridIntensity(10), + m_displayTraceIntensity(50) { setAttribute(Qt::WA_OpaquePaintEvent); connect(&m_timer, SIGNAL(timeout()), this, SLOT(tick())); @@ -479,7 +479,7 @@ void GLScopeNG::paintGL() if(end - start < 2) start--; - for (int i = 1; i < m_traces->size(); i++) + for (unsigned int i = 1; i < m_traces->size(); i++) { const float *trace = (*m_traces)[i]; const ScopeVisNG::TraceData& traceData = (*m_tracesData)[i]; @@ -702,7 +702,7 @@ void GLScopeNG::paintGL() if(end - start < 2) start--; - for (int i = 0; i < m_traces->size(); i++) + for (unsigned int i = 0; i < m_traces->size(); i++) { const float *trace = (*m_traces)[i]; const ScopeVisNG::TraceData& traceData = (*m_tracesData)[i]; @@ -875,7 +875,7 @@ void GLScopeNG::paintGL() const float *trace0 = (*m_traces)[0]; memcpy(q3, &(trace0[2*start+1]), (2*(end - start) - 1)*sizeof(float)); // copy X values - for (int i = 1; i < m_traces->size(); i++) + for (unsigned int i = 1; i < m_traces->size(); i++) { const float *trace = (*m_traces)[i]; const ScopeVisNG::TraceData& traceData = (*m_tracesData)[i]; @@ -969,7 +969,6 @@ void GLScopeNG::applyConfig() m_configChanged = false; QFontMetrics fm(font()); - int M = fm.width("-"); //float t_start = ((m_timeOfsProMill / 1000.0) * ((float) m_traceSize / m_sampleRate)) - ((float) m_triggerPre / m_sampleRate); float t_start = (((m_timeOfsProMill / 1000.0f) * (float) m_traceSize) / m_sampleRate) - ((float) m_triggerPre / m_sampleRate); float t_len = ((float) m_traceSize / m_sampleRate) / (float) m_timeBase; diff --git a/sdrbase/gui/glscopenggui.cpp b/sdrbase/gui/glscopenggui.cpp index 62e003c2c..5bd258e85 100644 --- a/sdrbase/gui/glscopenggui.cpp +++ b/sdrbase/gui/glscopenggui.cpp @@ -28,12 +28,12 @@ GLScopeNGGUI::GLScopeNGGUI(QWidget* parent) : QWidget(parent), ui(new Ui::GLScopeNGGUI), m_messageQueue(0), - m_glScope(0), m_scopeVis(0), + m_glScope(0), m_sampleRate(0), - m_traceLenMult(1), m_timeBase(1), - m_timeOffset(0) + m_timeOffset(0), + m_traceLenMult(1) { qDebug("GLScopeNGGUI::GLScopeNGGUI"); setEnabled(false); @@ -177,7 +177,7 @@ QByteArray GLScopeNGGUI::serialize() const s.writeU32(200, (uint32_t) m_scopeVis->getNbTriggers()); s.writeS32(201, ui->trigPre->value()); - for (int i = 0; i < m_scopeVis->getNbTriggers(); i++) + for (unsigned int i = 0; i < m_scopeVis->getNbTriggers(); i++) { const ScopeVisNG::TriggerData& triggerData = m_scopeVis->getTriggerData(i); s.writeS32(210 + 16*i, (int) triggerData.m_projectionType); @@ -266,7 +266,7 @@ bool GLScopeNGGUI::deserialize(const QByteArray& data) uint32_t nbTracesSaved; d.readU32(10, &nbTracesSaved, 1); const std::vector& tracesData = m_scopeVis->getTracesData(); - int iTrace = tracesData.size(); + uint32_t iTrace = tracesData.size(); qDebug("GLScopeNGGUI::deserialize: nbTracesSaved: %u tracesData.size(): %lu", nbTracesSaved, tracesData.size()); @@ -335,7 +335,7 @@ bool GLScopeNGGUI::deserialize(const QByteArray& data) uint32_t nbTriggersSaved; d.readU32(200, &nbTriggersSaved, 1); uint32_t nbTriggers = m_scopeVis->getNbTriggers(); - int iTrigger = nbTriggers; + uint32_t iTrigger = nbTriggers; d.readS32(201, &intValue, 0); ui->trigPre->setValue(intValue); @@ -548,14 +548,14 @@ void GLScopeNGGUI::on_trace_valueChanged(int value) m_scopeVis->focusOnTrace(value); } -void GLScopeNGGUI::on_traceAdd_clicked(bool checked) +void GLScopeNGGUI::on_traceAdd_clicked(bool checked __attribute__((unused))) { ScopeVisNG::TraceData traceData; fillTraceData(traceData); addTrace(traceData); } -void GLScopeNGGUI::on_traceDel_clicked(bool checked) +void GLScopeNGGUI::on_traceDel_clicked(bool checked __attribute__((unused))) { if (ui->trace->value() > 0) // not the X trace { @@ -576,7 +576,7 @@ void GLScopeNGGUI::on_traceDel_clicked(bool checked) } } -void GLScopeNGGUI::on_traceUp_clicked(bool checked) +void GLScopeNGGUI::on_traceUp_clicked(bool checked __attribute__((unused))) { if (ui->trace->maximum() > 0) // more than one trace { @@ -590,7 +590,7 @@ void GLScopeNGGUI::on_traceUp_clicked(bool checked) } } -void GLScopeNGGUI::on_traceDown_clicked(bool checked) +void GLScopeNGGUI::on_traceDown_clicked(bool checked __attribute__((unused))) { if (ui->trace->value() > 0) // not the X (lowest) trace { @@ -623,14 +623,14 @@ void GLScopeNGGUI::on_trig_valueChanged(int value) m_scopeVis->focusOnTrigger(value); } -void GLScopeNGGUI::on_trigAdd_clicked(bool checked) +void GLScopeNGGUI::on_trigAdd_clicked(bool checked __attribute__((unused))) { ScopeVisNG::TriggerData triggerData; fillTriggerData(triggerData); addTrigger(triggerData); } -void GLScopeNGGUI::on_trigDel_clicked(bool checked) +void GLScopeNGGUI::on_trigDel_clicked(bool checked __attribute__((unused))) { if (ui->trig->value() > 0) { @@ -639,7 +639,7 @@ void GLScopeNGGUI::on_trigDel_clicked(bool checked) } } -void GLScopeNGGUI::on_trigUp_clicked(bool checked) +void GLScopeNGGUI::on_trigUp_clicked(bool checked __attribute__((unused))) { if (ui->trig->maximum() > 0) // more than one trigger { @@ -653,7 +653,7 @@ void GLScopeNGGUI::on_trigUp_clicked(bool checked) } } -void GLScopeNGGUI::on_trigDown_clicked(bool checked) +void GLScopeNGGUI::on_trigDown_clicked(bool checked __attribute__((unused))) { if (ui->trig->value() > 0) // not the 0 (lowest) trigger { @@ -667,44 +667,44 @@ void GLScopeNGGUI::on_trigDown_clicked(bool checked) } } -void GLScopeNGGUI::on_traceMode_currentIndexChanged(int index) +void GLScopeNGGUI::on_traceMode_currentIndexChanged(int index __attribute__((unused))) { setAmpScaleDisplay(); setAmpOfsDisplay(); changeCurrentTrace(); } -void GLScopeNGGUI::on_amp_valueChanged(int value) +void GLScopeNGGUI::on_amp_valueChanged(int value __attribute__((unused))) { setAmpScaleDisplay(); changeCurrentTrace(); } -void GLScopeNGGUI::on_ofsCoarse_valueChanged(int value) +void GLScopeNGGUI::on_ofsCoarse_valueChanged(int value __attribute__((unused))) { setAmpOfsDisplay(); changeCurrentTrace(); } -void GLScopeNGGUI::on_ofsFine_valueChanged(int value) +void GLScopeNGGUI::on_ofsFine_valueChanged(int value __attribute__((unused))) { setAmpOfsDisplay(); changeCurrentTrace(); } -void GLScopeNGGUI::on_traceDelayCoarse_valueChanged(int value) +void GLScopeNGGUI::on_traceDelayCoarse_valueChanged(int value __attribute__((unused))) { setTraceDelayDisplay(); changeCurrentTrace(); } -void GLScopeNGGUI::on_traceDelayFine_valueChanged(int value) +void GLScopeNGGUI::on_traceDelayFine_valueChanged(int value __attribute__((unused))) { setTraceDelayDisplay(); changeCurrentTrace(); } -void GLScopeNGGUI::on_traceView_toggled(bool checked) +void GLScopeNGGUI::on_traceView_toggled(bool checked __attribute__((unused))) { changeCurrentTrace(); } @@ -732,13 +732,13 @@ void GLScopeNGGUI::on_mem_valueChanged(int value) m_scopeVis->setMemoryIndex(value); } -void GLScopeNGGUI::on_trigMode_currentIndexChanged(int index) +void GLScopeNGGUI::on_trigMode_currentIndexChanged(int index __attribute__((unused))) { setTrigLevelDisplay(); changeCurrentTrigger(); } -void GLScopeNGGUI::on_trigCount_valueChanged(int value) +void GLScopeNGGUI::on_trigCount_valueChanged(int value __attribute__((unused))) { setTrigCountDisplay(); changeCurrentTrigger(); @@ -774,31 +774,31 @@ void GLScopeNGGUI::on_trigBoth_toggled(bool checked) changeCurrentTrigger(); } -void GLScopeNGGUI::on_trigLevelCoarse_valueChanged(int value) +void GLScopeNGGUI::on_trigLevelCoarse_valueChanged(int value __attribute__((unused))) { setTrigLevelDisplay(); changeCurrentTrigger(); } -void GLScopeNGGUI::on_trigLevelFine_valueChanged(int value) +void GLScopeNGGUI::on_trigLevelFine_valueChanged(int value __attribute__((unused))) { setTrigLevelDisplay(); changeCurrentTrigger(); } -void GLScopeNGGUI::on_trigDelayCoarse_valueChanged(int value) +void GLScopeNGGUI::on_trigDelayCoarse_valueChanged(int value __attribute__((unused))) { setTrigDelayDisplay(); changeCurrentTrigger(); } -void GLScopeNGGUI::on_trigDelayFine_valueChanged(int value) +void GLScopeNGGUI::on_trigDelayFine_valueChanged(int value __attribute__((unused))) { setTrigDelayDisplay(); changeCurrentTrigger(); } -void GLScopeNGGUI::on_trigPre_valueChanged(int value) +void GLScopeNGGUI::on_trigPre_valueChanged(int value __attribute__((unused))) { setTrigPreDisplay(); m_scopeVis->configure(m_traceLenMult*ScopeVisNG::m_traceChunkSize, @@ -1293,7 +1293,7 @@ void GLScopeNGGUI::applySettings() { } -bool GLScopeNGGUI::handleMessage(Message* message) +bool GLScopeNGGUI::handleMessage(Message* message __attribute__((unused))) { return false; } diff --git a/sdrbase/gui/glshadersimple.cpp b/sdrbase/gui/glshadersimple.cpp index e06b7f997..913dc03e4 100644 --- a/sdrbase/gui/glshadersimple.cpp +++ b/sdrbase/gui/glshadersimple.cpp @@ -26,8 +26,8 @@ GLShaderSimple::GLShaderSimple() : m_program(0), - m_colorLoc(0), - m_matrixLoc(0) + m_matrixLoc(0), + m_colorLoc(0) { } GLShaderSimple::~GLShaderSimple() diff --git a/sdrbase/gui/glspectrum.cpp b/sdrbase/gui/glspectrum.cpp index c6031d12b..5015b6ab5 100644 --- a/sdrbase/gui/glspectrum.cpp +++ b/sdrbase/gui/glspectrum.cpp @@ -30,6 +30,7 @@ GLSpectrum::GLSpectrum(QWidget* parent) : QGLWidget(parent), m_cursorState(CSNormal), + m_cursorChannel(0), m_mouseInside(false), m_changesPending(true), m_centerFrequency(100000000), @@ -46,19 +47,18 @@ GLSpectrum::GLSpectrum(QWidget* parent) : m_currentSpectrum(0), m_displayCurrent(false), m_waterfallBuffer(NULL), - m_waterfallTextureHeight(-1), - m_displayWaterfall(true), - m_ssbSpectrum(false), - m_histogramBuffer(NULL), - m_histogram(NULL), - m_histogramHoldoff(NULL), - m_displayHistogram(true), - m_displayChanged(false), - m_colorLoc(0), m_waterfallBufferPos(0), - m_cursorChannel(0), - m_waterfallTexturePos(0), - m_matrixLoc(0) + m_waterfallTextureHeight(-1), + m_waterfallTexturePos(0), + m_displayWaterfall(true), + m_ssbSpectrum(false), + m_histogramBuffer(NULL), + m_histogram(NULL), + m_histogramHoldoff(NULL), + m_displayHistogram(true), + m_displayChanged(false), + m_matrixLoc(0), + m_colorLoc(0) { setAutoFillBackground(false); setAttribute(Qt::WA_OpaquePaintEvent, true); @@ -995,7 +995,7 @@ void GLSpectrum::applyChanges() int waterfallHeight = 0; int waterfallTop = 0; int frequencyScaleHeight = fm.height() * 3; // +1 line for marker frequency scale - int frequencyScaleTop; + int frequencyScaleTop = 0; int histogramTop = 0; int histogramHeight = 20; int leftMargin; diff --git a/sdrbase/gui/glspectrumgui.cpp b/sdrbase/gui/glspectrumgui.cpp index 8cc49c6e5..bfe576d6b 100644 --- a/sdrbase/gui/glspectrumgui.cpp +++ b/sdrbase/gui/glspectrumgui.cpp @@ -293,7 +293,7 @@ void GLSpectrumGUI::on_traceIntensity_valueChanged(int index) m_glSpectrum->setDisplayTraceIntensity(m_displayTraceIntensity); } -void GLSpectrumGUI::on_clearSpectrum_clicked(bool checked) +void GLSpectrumGUI::on_clearSpectrum_clicked(bool checked __attribute__((unused))) { if(m_glSpectrum != NULL) m_glSpectrum->clearSpectrumHistogram(); diff --git a/sdrbase/gui/levelmeter.cpp b/sdrbase/gui/levelmeter.cpp index 5da48f471..c36d2e78a 100644 --- a/sdrbase/gui/levelmeter.cpp +++ b/sdrbase/gui/levelmeter.cpp @@ -66,8 +66,8 @@ LevelMeter::LevelMeter(QWidget *parent) , m_peakHoldLevel(0.0) , m_redrawTimer(new QTimer(this)) , m_avgColor(0xff, 0x8b, 0x00, 128) // color mapper foreground - , m_decayedPeakColor(0x97, 0x54, 0x00, 128) // color mapper 59% , m_peakColor(Qt::red) // just red 100% opaque + , m_decayedPeakColor(0x97, 0x54, 0x00, 128) // color mapper 59% , m_backgroundPixmap(0) { setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred); @@ -269,8 +269,8 @@ const QColor LevelMeterSignalDB::m_peakColor[3] = { }; LevelMeterSignalDB::LevelMeterSignalDB(QWidget *parent) : - m_colorTheme(ColorGold), - LevelMeter(parent) + LevelMeter(parent), + m_colorTheme(ColorGold) { m_scaleEngine.setFont(font()); m_scaleEngine.setOrientation(Qt::Horizontal); diff --git a/sdrbase/gui/mypositiondialog.cpp b/sdrbase/gui/mypositiondialog.cpp index 6b84f1fff..8b9b5177f 100644 --- a/sdrbase/gui/mypositiondialog.cpp +++ b/sdrbase/gui/mypositiondialog.cpp @@ -23,9 +23,9 @@ MyPositionDialog::MyPositionDialog(MainSettings& mainSettings, QWidget* parent) : - m_mainSettings(mainSettings), - QDialog(parent), - ui(new Ui::MyPositionDialog) + QDialog(parent), + ui(new Ui::MyPositionDialog), + m_mainSettings(mainSettings) { ui->setupUi(this); ui->latitudeSpinBox->setValue(m_mainSettings.getLatitude()); diff --git a/sdrbase/gui/scaleengine.cpp b/sdrbase/gui/scaleengine.cpp index a1368e065..4d0151771 100644 --- a/sdrbase/gui/scaleengine.cpp +++ b/sdrbase/gui/scaleengine.cpp @@ -486,17 +486,17 @@ double ScaleEngine::minorTickValue(int tick) ScaleEngine::ScaleEngine() : m_orientation(Qt::Horizontal), - m_physicalUnit(Unit::None), - m_rangeMin(-1.0), - m_rangeMax(1.0), - m_recalc(true), m_charSize(8), - m_numMinorTicks(1), - m_decimalPlaces(1), - m_size(1.0f), - m_firstMajorTickValue(1.0), + m_size(1.0f), + m_physicalUnit(Unit::None), + m_rangeMin(-1.0), + m_rangeMax(1.0), + m_recalc(true), + m_scale(1.0f), m_majorTickValueDistance(1.0), - m_scale(1.0f) + m_firstMajorTickValue(1.0), + m_numMinorTicks(1), + m_decimalPlaces(1) { } diff --git a/sdrbase/gui/valuedialz.cpp b/sdrbase/gui/valuedialz.cpp index 22a922f1d..5b59c5ee0 100644 --- a/sdrbase/gui/valuedialz.cpp +++ b/sdrbase/gui/valuedialz.cpp @@ -25,8 +25,8 @@ #include "gui/valuedialz.h" ValueDialZ::ValueDialZ(bool positiveOnly, QWidget* parent, ColorMapper colorMapper) : + QWidget(parent), m_positiveOnly(positiveOnly), - QWidget(parent), m_animationState(0), m_colorMapper(colorMapper) { diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index 0ab4abcb1..cc01e6837 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -56,8 +56,8 @@ MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), ui(new Ui::MainWindow), - m_masterTabIndex(0), m_settings(), + m_masterTabIndex(0), m_dspEngine(DSPEngine::instance()), m_lastEngineState((DSPDeviceSourceEngine::State)-1), m_inputGUI(0), @@ -211,7 +211,7 @@ void MainWindow::addSourceDevice() ui->tabInputsSelect->addTab(m_deviceUIs.back()->m_samplingDeviceControl, tabNameCStr); ui->tabInputsSelect->setTabToolTip(deviceTabIndex, QString(uidCStr)); - int sampleSourceIndex = m_pluginManager->selectSampleSourceBySerialOrSequence("sdrangel.samplesource.filesource", "0", 0, m_deviceUIs.back()->m_deviceSourceAPI); + m_pluginManager->selectSampleSourceBySerialOrSequence("sdrangel.samplesource.filesource", "0", 0, m_deviceUIs.back()->m_deviceSourceAPI); } void MainWindow::addSinkDevice() @@ -256,7 +256,7 @@ void MainWindow::addSinkDevice() ui->tabInputsSelect->addTab(m_deviceUIs.back()->m_samplingDeviceControl, tabNameCStr); ui->tabInputsSelect->setTabToolTip(deviceTabIndex, QString(uidCStr)); - int sampleSinkIndex = m_pluginManager->selectSampleSinkBySerialOrSequence("sdrangel.samplesink.filesink", "0", 0, m_deviceUIs.back()->m_deviceSinkAPI); + m_pluginManager->selectSampleSinkBySerialOrSequence("sdrangel.samplesink.filesink", "0", 0, m_deviceUIs.back()->m_deviceSinkAPI); } void MainWindow::removeLastDevice() @@ -719,12 +719,12 @@ void MainWindow::on_presetDelete_clicked() } } -void MainWindow::on_presetTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous) +void MainWindow::on_presetTree_currentItemChanged(QTreeWidgetItem *current __attribute__((unused)), QTreeWidgetItem *previous __attribute__((unused))) { updatePresetControls(); } -void MainWindow::on_presetTree_itemActivated(QTreeWidgetItem *item, int column) +void MainWindow::on_presetTree_itemActivated(QTreeWidgetItem *item __attribute__((unused)), int column __attribute__((unused))) { on_presetLoad_clicked(); } @@ -783,7 +783,7 @@ void MainWindow::on_action_DV_Serial_triggered(bool checked) } } -void MainWindow::on_sampleSource_confirmClicked(bool checked) +void MainWindow::on_sampleSource_confirmClicked(bool checked __attribute__((unused))) { // Do it in the currently selected source tab int currentSourceTabIndex = ui->tabInputsSelect->currentIndex(); @@ -845,7 +845,7 @@ void MainWindow::on_sampleSource_confirmClicked(bool checked) } } -void MainWindow::on_sampleSink_confirmClicked(bool checked) +void MainWindow::on_sampleSink_confirmClicked(bool checked __attribute__((unused))) { // Do it in the currently selected source tab int currentSinkTabIndex = ui->tabInputsSelect->currentIndex(); @@ -902,7 +902,7 @@ void MainWindow::on_sampleSink_confirmClicked(bool checked) } } -void MainWindow::on_channel_addClicked(bool checked) +void MainWindow::on_channel_addClicked(bool checked __attribute__((unused))) { // Do it in the currently selected source tab int currentSourceTabIndex = ui->tabInputsSelect->currentIndex(); diff --git a/sdrbase/plugin/plugininterface.h b/sdrbase/plugin/plugininterface.h index 0d691e440..0cf6b3512 100644 --- a/sdrbase/plugin/plugininterface.h +++ b/sdrbase/plugin/plugininterface.h @@ -50,18 +50,18 @@ public: virtual void initPlugin(PluginAPI* pluginAPI) = 0; // channel Rx plugins - virtual PluginGUI* createRxChannel(const QString& channelName, DeviceSourceAPI *deviceAPI) { return 0; } + virtual PluginGUI* createRxChannel(const QString& channelName __attribute__((unused)), DeviceSourceAPI *deviceAPI __attribute__((unused)) ) { return 0; } // channel Tx plugins - virtual PluginGUI* createTxChannel(const QString& channelName, DeviceSinkAPI *deviceAPI) { return 0; } + virtual PluginGUI* createTxChannel(const QString& channelName __attribute__((unused)), DeviceSinkAPI *deviceAPI __attribute__((unused)) ) { return 0; } // device source plugins only virtual SamplingDevices enumSampleSources() { return SamplingDevices(); } - virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId, QWidget **widget, DeviceSourceAPI *deviceAPI) { return 0; } + virtual PluginGUI* createSampleSourcePluginGUI(const QString& sourceId __attribute__((unused)), QWidget **widget __attribute__((unused)), DeviceSourceAPI *deviceAPI __attribute__((unused))) { return 0; } // device sink plugins only virtual SamplingDevices enumSampleSinks() { return SamplingDevices(); } - virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId, QWidget **widget, DeviceSinkAPI *deviceAPI) { return 0; } + virtual PluginGUI* createSampleSinkPluginGUI(const QString& sinkId __attribute__((unused)), QWidget **widget __attribute__((unused)), DeviceSinkAPI *deviceAPI __attribute__((unused))) { return 0; } }; Q_DECLARE_INTERFACE(PluginInterface, "SDRangel.PluginInterface/0.1"); diff --git a/sdrbase/plugin/pluginmanager.cpp b/sdrbase/plugin/pluginmanager.cpp index cf563a4cc..c1af659cc 100644 --- a/sdrbase/plugin/pluginmanager.cpp +++ b/sdrbase/plugin/pluginmanager.cpp @@ -548,7 +548,7 @@ int PluginManager::selectFirstSampleSink(const QString& sinkId, DeviceSinkAPI *d return index; } -int PluginManager::selectSampleSourceBySerialOrSequence(const QString& sourceId, const QString& sourceSerial, int sourceSequence, DeviceSourceAPI *deviceAPI) +int PluginManager::selectSampleSourceBySerialOrSequence(const QString& sourceId, const QString& sourceSerial, uint32_t sourceSequence, DeviceSourceAPI *deviceAPI) { qDebug("PluginManager::selectSampleSourceBySequence by sequence: id: %s ser: %s seq: %d", qPrintable(sourceId), qPrintable(sourceSerial), sourceSequence); @@ -624,7 +624,7 @@ int PluginManager::selectSampleSourceBySerialOrSequence(const QString& sourceId, return index; } -int PluginManager::selectSampleSinkBySerialOrSequence(const QString& sinkId, const QString& sinkSerial, int sinkSequence, DeviceSinkAPI *deviceAPI) +int PluginManager::selectSampleSinkBySerialOrSequence(const QString& sinkId, const QString& sinkSerial, uint32_t sinkSequence, DeviceSinkAPI *deviceAPI) { qDebug("PluginManager::selectSampleSinkBySerialOrSequence by sequence: id: %s ser: %s seq: %d", qPrintable(sinkId), qPrintable(sinkSerial), sinkSequence); diff --git a/sdrbase/plugin/pluginmanager.h b/sdrbase/plugin/pluginmanager.h index 4e8bf9991..c2d9a8c17 100644 --- a/sdrbase/plugin/pluginmanager.h +++ b/sdrbase/plugin/pluginmanager.h @@ -62,12 +62,12 @@ public: int selectSampleSourceByIndex(int index, DeviceSourceAPI *deviceAPI); int selectFirstSampleSource(const QString& sourceId, DeviceSourceAPI *deviceAPI); - int selectSampleSourceBySerialOrSequence(const QString& sourceId, const QString& sourceSerial, int sourceSequence, DeviceSourceAPI *deviceAPI); + int selectSampleSourceBySerialOrSequence(const QString& sourceId, const QString& sourceSerial, uint32_t sourceSequence, DeviceSourceAPI *deviceAPI); void selectSampleSourceByDevice(void *devicePtr, DeviceSourceAPI *deviceAPI); int selectSampleSinkByIndex(int index, DeviceSinkAPI *deviceAPI); int selectFirstSampleSink(const QString& sourceId, DeviceSinkAPI *deviceAPI); - int selectSampleSinkBySerialOrSequence(const QString& sinkId, const QString& sinkSerial, int sinkSequence, DeviceSinkAPI *deviceAPI); + int selectSampleSinkBySerialOrSequence(const QString& sinkId, const QString& sinkSerial, uint32_t sinkSequence, DeviceSinkAPI *deviceAPI); void selectSampleSinkByDevice(void *devicePtr, DeviceSinkAPI *deviceAPI); void populateRxChannelComboBox(QComboBox *channels); @@ -94,7 +94,7 @@ private: QString m_hadrwareId; QString m_deviceId; QString m_deviceSerial; - int m_deviceSequence; + uint32_t m_deviceSequence; SamplingDevice(PluginInterface* plugin, const QString& displayName, diff --git a/sdrbase/util/syncmessenger.cpp b/sdrbase/util/syncmessenger.cpp index 2094912e7..5b9032b40 100644 --- a/sdrbase/util/syncmessenger.cpp +++ b/sdrbase/util/syncmessenger.cpp @@ -20,8 +20,8 @@ SyncMessenger::SyncMessenger() : m_complete(0), - m_result(0), - m_message(0) + m_message(0), + m_result(0) { qRegisterMetaType("Message"); } diff --git a/sdrbase/util/udpsink.h b/sdrbase/util/udpsink.h index a5a903214..cb0ea04dd 100644 --- a/sdrbase/util/udpsink.h +++ b/sdrbase/util/udpsink.h @@ -79,7 +79,7 @@ private: unsigned int m_port; QUdpSocket *m_socket; T *m_sampleBuffer;; - int m_sampleBufferIndex; + uint32_t m_sampleBufferIndex; };