From 324aaa86b6d46d00ee3149fbb8c3041b417bdf60 Mon Sep 17 00:00:00 2001 From: f4exb Date: Fri, 29 Dec 2017 03:22:04 +0100 Subject: [PATCH] Plugins: cppcheck corrections --- plugins/channelrx/demodbfm/rdsdecoder.cpp | 4 +++- plugins/channelrx/demodbfm/rdsparser.cpp | 6 +++--- plugins/channeltx/modatv/atvmodsettings.cpp | 2 ++ plugins/channeltx/udpsink/udpsink.cpp | 2 +- plugins/channeltx/udpsink/udpsinksettings.cpp | 1 + .../samplesink/plutosdroutput/plutosdroutputsettings.cpp | 1 + plugins/samplesource/fcdproplus/fcdproplussettings.cpp | 1 + .../samplesource/plutosdrinput/plutosdrinputsettings.cpp | 1 + 8 files changed, 13 insertions(+), 5 deletions(-) diff --git a/plugins/channelrx/demodbfm/rdsdecoder.cpp b/plugins/channelrx/demodbfm/rdsdecoder.cpp index 730dc59ed..493d90f24 100644 --- a/plugins/channelrx/demodbfm/rdsdecoder.cpp +++ b/plugins/channelrx/demodbfm/rdsdecoder.cpp @@ -15,9 +15,10 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include "../../channelrx/demodbfm/rdsdecoder.h" +#include "rdsdecoder.h" #include +#include const unsigned int RDSDecoder::offset_pos[5] = {0,1,2,3,2}; const unsigned int RDSDecoder::offset_word[5] = {252,408,360,436,848}; @@ -41,6 +42,7 @@ RDSDecoder::RDSDecoder() m_wrongBlocksCounter = 0; m_goodBlock = false; m_qua = 0.0f; + memset(m_group, 0, 4*sizeof(int)); } RDSDecoder::~RDSDecoder() diff --git a/plugins/channelrx/demodbfm/rdsparser.cpp b/plugins/channelrx/demodbfm/rdsparser.cpp index 2e4433f59..2fa8e1360 100644 --- a/plugins/channelrx/demodbfm/rdsparser.cpp +++ b/plugins/channelrx/demodbfm/rdsparser.cpp @@ -15,7 +15,8 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include "../../channelrx/demodbfm/rdsparser.h" +#include "rdsparser.h" +#include "rdstmc.h" #include #include @@ -25,7 +26,6 @@ #include #include "boost/format.hpp" -#include "../../channelrx/demodbfm/rdstmc.h" const unsigned int RDSParser::offset_pos[5] = {0,1,2,3,2}; const unsigned int RDSParser::offset_word[5] = {252,408,360,436,848}; @@ -743,7 +743,7 @@ void RDSParser::decode_type3(unsigned int *group, bool B) qDebug() << "RDSParser::decode_type3: aid group: " << application_group << " " << (group_type ? 'B' : 'A');*/ - if ((application_group == 8) && (group_type == false)) + if ((application_group == 8) && (group_type == 0)) { // 8A int variant_code = (message >> 14) & 0x3; diff --git a/plugins/channeltx/modatv/atvmodsettings.cpp b/plugins/channeltx/modatv/atvmodsettings.cpp index 26d39cb76..24c9beca2 100644 --- a/plugins/channeltx/modatv/atvmodsettings.cpp +++ b/plugins/channeltx/modatv/atvmodsettings.cpp @@ -50,6 +50,8 @@ void ATVModSettings::resetToDefaults() m_overlayText = "ATV"; m_rgbColor = QColor(255, 255, 255).rgb(); m_title = "ATV Modulator"; + m_udpAddress = "127.0.0.1"; + m_udpPort = 9999; } QByteArray ATVModSettings::serialize() const diff --git a/plugins/channeltx/udpsink/udpsink.cpp b/plugins/channeltx/udpsink/udpsink.cpp index 7630cf85d..0ec1436be 100644 --- a/plugins/channeltx/udpsink/udpsink.cpp +++ b/plugins/channeltx/udpsink/udpsink.cpp @@ -386,7 +386,7 @@ bool UDPSink::handleMessage(const Message& cmd) { m_actualInputSampleRate = newSampleRate; - if ((cfg.getRawDeltaRatio() > -0.05) || (cfg.getRawDeltaRatio() < 0.05)) + if ((cfg.getRawDeltaRatio() > -0.05) && (cfg.getRawDeltaRatio() < 0.05)) { if (m_sampleRateAvgCounter < m_sampleRateAverageItems) { diff --git a/plugins/channeltx/udpsink/udpsinksettings.cpp b/plugins/channeltx/udpsink/udpsinksettings.cpp index 5a85c0cef..0d25477ac 100644 --- a/plugins/channeltx/udpsink/udpsinksettings.cpp +++ b/plugins/channeltx/udpsink/udpsinksettings.cpp @@ -33,6 +33,7 @@ void UDPSinkSettings::resetToDefaults() m_outputSampleRate = 48000; m_sampleFormat = FormatS16LE; m_inputSampleRate = 48000; + m_basebandSampleRate = 48000; m_inputFrequencyOffset = 0; m_rfBandwidth = 12500; m_fmDeviation = 2500; diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputsettings.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputsettings.cpp index 21ef340c4..90e1652e8 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputsettings.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputsettings.cpp @@ -34,6 +34,7 @@ void PlutoSDROutputSettings::resetToDefaults() m_lpfFIREnable = false; m_lpfFIRBW = 500000U; m_lpfFIRlog2Interp = 0; + m_lpfFIRGain = 0; m_att = -50; m_antennaPath = RFPATH_A; m_transverterMode = false; diff --git a/plugins/samplesource/fcdproplus/fcdproplussettings.cpp b/plugins/samplesource/fcdproplus/fcdproplussettings.cpp index 0751c78ac..15b7abcd2 100644 --- a/plugins/samplesource/fcdproplus/fcdproplussettings.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplussettings.cpp @@ -30,6 +30,7 @@ void FCDProPlusSettings::resetToDefaults() m_lnaGain = true; m_biasT = false; m_ifGain = 0; + m_mixGain = 0; m_rfFilterIndex = 0; m_ifFilterIndex = 0; m_LOppmTenths = 0; diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp index ac5f7cb33..c90e7a630 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputsettings.cpp @@ -38,6 +38,7 @@ void PlutoSDRInputSettings::resetToDefaults() m_lpfFIREnable = false; m_lpfFIRBW = 500000U; m_lpfFIRlog2Decim = 0; + m_lpfFIRGain = 0; m_gain = 40; m_antennaPath = RFPATH_A_BAL; m_gainMode = GAIN_MANUAL;