diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp index 12939e2bb..86ecc7461 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp @@ -38,7 +38,7 @@ BladerfOutputGui::BladerfOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_settings(), m_deviceSampleSink(NULL), m_sampleRate(0), - m_lastEngineState((DSPDeviceSinkEngine::State)-1) + m_lastEngineState(DSPDeviceSinkEngine::StNotStarted) { m_deviceSampleSink = (BladerfOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink(); diff --git a/plugins/samplesink/filesink/filesinkgui.cpp b/plugins/samplesink/filesink/filesinkgui.cpp index 4b054c748..c05d525c0 100644 --- a/plugins/samplesink/filesink/filesinkgui.cpp +++ b/plugins/samplesink/filesink/filesinkgui.cpp @@ -49,7 +49,7 @@ FileSinkGui::FileSinkGui(DeviceUISet *deviceUISet, QWidget* parent) : m_startingTimeStamp(0), m_samplesCount(0), m_tickCount(0), - m_lastEngineState((DSPDeviceSinkEngine::State)-1) + m_lastEngineState(DSPDeviceSinkEngine::StNotStarted) { ui->setupUi(this); diff --git a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp index fa4e31b0c..153df00d9 100644 --- a/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp +++ b/plugins/samplesink/hackrfoutput/hackrfoutputgui.cpp @@ -40,7 +40,7 @@ HackRFOutputGui::HackRFOutputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_deviceSampleSink(0), - m_lastEngineState((DSPDeviceSinkEngine::State)-1), + m_lastEngineState(DSPDeviceSinkEngine::StNotStarted), m_doApplySettings(true) { m_deviceSampleSink = (HackRFOutput*) m_deviceUISet->m_deviceSinkAPI->getSampleSink(); diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index ed0a89575..b04bab065 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -32,7 +32,7 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceUISet(deviceUISet), m_settings(), m_sampleRate(0), - m_lastEngineState((DSPDeviceSinkEngine::State)-1), + m_lastEngineState(DSPDeviceSinkEngine::StNotStarted), m_doApplySettings(true), m_forceSettings(true), m_statusCounter(0), diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp index 498081ad3..731240c46 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.cpp @@ -37,7 +37,7 @@ PlutoSDROutputGUI::PlutoSDROutputGUI(DeviceUISet *deviceUISet, QWidget* parent) m_sampleSink(0), m_sampleRate(0), m_deviceCenterFrequency(0), - m_lastEngineState((DSPDeviceSinkEngine::State)-1), + m_lastEngineState(DSPDeviceSinkEngine::StNotStarted), m_doApplySettings(true), m_statusCounter(0) { diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp index 794a7c343..55e65d616 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkgui.cpp @@ -50,7 +50,7 @@ SDRdaemonSinkGui::SDRdaemonSinkGui(DeviceUISet *deviceUISet, QWidget* parent) : m_samplesCount(0), m_tickCount(0), m_nbSinceLastFlowCheck(0), - m_lastEngineState((DSPDeviceSinkEngine::State)-1), + m_lastEngineState(DSPDeviceSinkEngine::StNotStarted), m_doApplySettings(true), m_forceSettings(true) { diff --git a/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp b/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp index 7e268e338..e1bad17d5 100644 --- a/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp +++ b/plugins/samplesink/sdrdaemonsink/udpsinkfec.cpp @@ -40,7 +40,8 @@ UDPSinkFEC::UDPSinkFEC() : m_frameCount(0), m_sampleIndex(0) { - memset((char *) m_txBlocks, 0, 4*256); + memset((char *) m_txBlocks, 0, 4*256*sizeof(SuperBlock)); + memset((char *) &m_superBlock, 0, sizeof(SuperBlock)); m_currentMetaFEC.init(); m_bufMeta = new uint8_t[m_udpSize]; m_buf = new uint8_t[m_udpSize]; diff --git a/plugins/samplesource/airspy/airspygui.cpp b/plugins/samplesource/airspy/airspygui.cpp index a1517425a..ae59a6ca7 100644 --- a/plugins/samplesource/airspy/airspygui.cpp +++ b/plugins/samplesource/airspy/airspygui.cpp @@ -39,7 +39,7 @@ AirspyGui::AirspyGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_sampleSource(0), - m_lastEngineState((DSPDeviceSourceEngine::State)-1) + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) { m_sampleSource = (AirspyInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); diff --git a/plugins/samplesource/airspyhf/airspyhfgui.cpp b/plugins/samplesource/airspyhf/airspyhfgui.cpp index 3ce6e2e57..3cfb3f103 100644 --- a/plugins/samplesource/airspyhf/airspyhfgui.cpp +++ b/plugins/samplesource/airspyhf/airspyhfgui.cpp @@ -38,7 +38,7 @@ AirspyHFGui::AirspyHFGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_sampleSource(0), - m_lastEngineState((DSPDeviceSourceEngine::State)-1) + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) { m_sampleSource = (AirspyHFInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); diff --git a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp index 1e4b8979d..568effb5c 100644 --- a/plugins/samplesource/bladerfinput/bladerfinputgui.cpp +++ b/plugins/samplesource/bladerfinput/bladerfinputgui.cpp @@ -38,7 +38,7 @@ BladerfInputGui::BladerfInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_settings(), m_sampleSource(NULL), m_sampleRate(0), - m_lastEngineState((DSPDeviceSourceEngine::State)-1) + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) { m_sampleSource = (BladerfInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); diff --git a/plugins/samplesource/fcdpro/fcdprogui.cpp b/plugins/samplesource/fcdpro/fcdprogui.cpp index bc3dafebb..20920db13 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.cpp +++ b/plugins/samplesource/fcdpro/fcdprogui.cpp @@ -35,7 +35,7 @@ FCDProGui::FCDProGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_sampleSource(NULL), - m_lastEngineState((DSPDeviceSourceEngine::State)-1) + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) { m_sampleSource = (FCDProInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp index 9a38c7122..210bb4752 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.cpp +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.cpp @@ -36,7 +36,7 @@ FCDProPlusGui::FCDProPlusGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_sampleSource(NULL), - m_lastEngineState((DSPDeviceSourceEngine::State)-1) + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) { m_sampleSource = (FCDProPlusInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); diff --git a/plugins/samplesource/filesource/filesourcegui.cpp b/plugins/samplesource/filesource/filesourcegui.cpp index a3049fef9..8bcedc3af 100644 --- a/plugins/samplesource/filesource/filesourcegui.cpp +++ b/plugins/samplesource/filesource/filesourcegui.cpp @@ -51,7 +51,7 @@ FileSourceGui::FileSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : m_samplesCount(0), m_tickCount(0), m_enableNavTime(false), - m_lastEngineState((DSPDeviceSourceEngine::State)-1) + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) { ui->setupUi(this); ui->centerFrequency->setColorMapper(ColorMapper(ColorMapper::GrayGold)); diff --git a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp index 9868313f2..6de6ca1b0 100644 --- a/plugins/samplesource/hackrfinput/hackrfinputgui.cpp +++ b/plugins/samplesource/hackrfinput/hackrfinputgui.cpp @@ -40,7 +40,7 @@ HackRFInputGui::HackRFInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_doApplySettings(true), m_sampleSource(NULL), - m_lastEngineState((DSPDeviceSourceEngine::State)-1) + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) { m_sampleSource = (HackRFInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp index dc243470f..0b44d28c3 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.cpp +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.cpp @@ -35,7 +35,7 @@ LimeSDRInputGUI::LimeSDRInputGUI(DeviceUISet *deviceUISet, QWidget* parent) : m_deviceUISet(deviceUISet), m_settings(), m_sampleRate(0), - m_lastEngineState((DSPDeviceSourceEngine::State)-1), + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), m_doApplySettings(true), m_forceSettings(true), m_statusCounter(0), diff --git a/plugins/samplesource/perseus/perseusgui.cpp b/plugins/samplesource/perseus/perseusgui.cpp index b2764a2eb..7ca36aa33 100644 --- a/plugins/samplesource/perseus/perseusgui.cpp +++ b/plugins/samplesource/perseus/perseusgui.cpp @@ -36,7 +36,7 @@ PerseusGui::PerseusGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_sampleSource(0), - m_lastEngineState((DSPDeviceSourceEngine::State)-1) + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) { m_sampleSource = (PerseusInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp index 65ce1477f..441413b0d 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp @@ -37,7 +37,7 @@ PlutoSDRInputGui::PlutoSDRInputGui(DeviceUISet *deviceUISet, QWidget* parent) : m_sampleSource(NULL), m_sampleRate(0), m_deviceCenterFrequency(0), - m_lastEngineState((DSPDeviceSourceEngine::State)-1), + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), m_doApplySettings(true), m_statusCounter(0) { diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp index d5db76d98..2c7e63f66 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.cpp +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.cpp @@ -38,7 +38,7 @@ RTLSDRGui::RTLSDRGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_settings(), m_sampleSource(0), - m_lastEngineState((DSPDeviceSourceEngine::State)-1) + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) { m_sampleSource = (RTLSDRInput*) m_deviceUISet->m_deviceSourceAPI->getSampleSource(); diff --git a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp index 0762af326..275436901 100644 --- a/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp +++ b/plugins/samplesource/sdrdaemonsource/sdrdaemonsourcegui.cpp @@ -54,7 +54,7 @@ SDRdaemonSourceGui::SDRdaemonSourceGui(DeviceUISet *deviceUISet, QWidget* parent m_acquisition(false), m_streamSampleRate(0), m_streamCenterFrequency(0), - m_lastEngineState((DSPDeviceSourceEngine::State)-1), + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), m_framesDecodingStatus(0), m_bufferLengthInSecs(0.0), m_bufferGauge(-50), diff --git a/plugins/samplesource/testsource/testsourcegui.cpp b/plugins/samplesource/testsource/testsourcegui.cpp index 7fbc84f32..abd4f8175 100644 --- a/plugins/samplesource/testsource/testsourcegui.cpp +++ b/plugins/samplesource/testsource/testsourcegui.cpp @@ -44,7 +44,7 @@ TestSourceGui::TestSourceGui(DeviceUISet *deviceUISet, QWidget* parent) : m_forceSettings(true), m_sampleSource(0), m_tickCount(0), - m_lastEngineState((DSPDeviceSourceEngine::State)-1) + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted) { qDebug("TestSourceGui::TestSourceGui"); m_sampleSource = m_deviceUISet->m_deviceSourceAPI->getSampleSource(); diff --git a/qrtplib/rtcpcompoundpacket.cpp b/qrtplib/rtcpcompoundpacket.cpp index 23d8ea179..c0e12e472 100644 --- a/qrtplib/rtcpcompoundpacket.cpp +++ b/qrtplib/rtcpcompoundpacket.cpp @@ -171,12 +171,6 @@ int RTCPCompoundPacket::ParseData(uint8_t *data, std::size_t datalen) p = new RTCPUnknownPacket(data, length); } - if (p == 0) - { - ClearPacketList(); - return ERR_RTP_OUTOFMEM; - } - rtcppacklist.push_back(p); datalen -= length; diff --git a/qrtplib/rtcpcompoundpacketbuilder.cpp b/qrtplib/rtcpcompoundpacketbuilder.cpp index 7aeba2abc..bfb4b5ee2 100644 --- a/qrtplib/rtcpcompoundpacketbuilder.cpp +++ b/qrtplib/rtcpcompoundpacketbuilder.cpp @@ -192,8 +192,6 @@ int RTCPCompoundPacketBuilder::AddReportBlock(uint32_t ssrc, uint8_t fractionlos return ERR_RTP_RTCPCOMPPACKBUILDER_NOTENOUGHBYTESLEFT; uint8_t *buf = new uint8_t[sizeof(RTCPReceiverReport)]; - if (buf == 0) - return ERR_RTP_OUTOFMEM; RTCPReceiverReport *rr = (RTCPReceiverReport *) buf; uint32_t *packlost = (uint32_t *) &packetslost; @@ -277,8 +275,6 @@ int RTCPCompoundPacketBuilder::AddSDESNormalItem(RTCPSDESPacket::ItemType t, con std::size_t len; buf = new uint8_t[sizeof(RTCPSDESHeader) + (std::size_t) itemlength]; - if (buf == 0) - return ERR_RTP_OUTOFMEM; len = sizeof(RTCPSDESHeader) + (std::size_t) itemlength; RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *) (buf); @@ -314,8 +310,6 @@ int RTCPCompoundPacketBuilder::AddSDESPrivateItem(const void *prefixdata, uint8_ std::size_t len; buf = new uint8_t[sizeof(RTCPSDESHeader) + itemlength]; - if (buf == 0) - return ERR_RTP_OUTOFMEM; len = sizeof(RTCPSDESHeader) + (std::size_t) itemlength; RTCPSDESHeader *sdeshdr = (RTCPSDESHeader *) (buf); @@ -367,8 +361,6 @@ int RTCPCompoundPacketBuilder::AddBYEPacket(uint32_t *ssrcs, uint8_t numssrcs, c std::size_t numwords; buf = new uint8_t[packsize]; - if (buf == 0) - return ERR_RTP_OUTOFMEM; RTCPCommonHeader *hdr = (RTCPCommonHeader *) buf; @@ -425,8 +417,6 @@ int RTCPCompoundPacketBuilder::AddAPPPacket(uint8_t subtype, uint32_t ssrc, cons uint8_t *buf; buf = new uint8_t[packsize]; - if (buf == 0) - return ERR_RTP_OUTOFMEM; RTCPCommonHeader *hdr = (RTCPCommonHeader *) buf; @@ -469,8 +459,6 @@ int RTCPCompoundPacketBuilder::EndBuild() if (!external) { buf = new uint8_t[len]; - if (buf == 0) - return ERR_RTP_OUTOFMEM; } else buf = buffer; @@ -526,13 +514,6 @@ int RTCPCompoundPacketBuilder::EndBuild() p = new RTCPSRPacket(curbuf, offset); else p = new RTCPRRPacket(curbuf, offset); - if (p == 0) - { - if (!external) - delete[] buf; - ClearPacketList(); - return ERR_RTP_OUTOFMEM; - } rtcppacklist.push_back(p); curbuf += offset; @@ -600,13 +581,6 @@ int RTCPCompoundPacketBuilder::EndBuild() hdr->length = qToBigEndian((uint16_t) (numwords - 1)); p = new RTCPSDESPacket(curbuf, offset); - if (p == 0) - { - if (!external) - delete[] buf; - ClearPacketList(); - return ERR_RTP_OUTOFMEM; - } rtcppacklist.push_back(p); curbuf += offset; @@ -625,13 +599,6 @@ int RTCPCompoundPacketBuilder::EndBuild() memcpy(curbuf, (*it).packetdata, (*it).packetlength); p = new RTCPAPPPacket(curbuf, (*it).packetlength); - if (p == 0) - { - if (!external) - delete[] buf; - ClearPacketList(); - return ERR_RTP_OUTOFMEM; - } rtcppacklist.push_back(p); curbuf += (*it).packetlength; @@ -648,13 +615,6 @@ int RTCPCompoundPacketBuilder::EndBuild() memcpy(curbuf, (*it).packetdata, (*it).packetlength); p = new RTCPBYEPacket(curbuf, (*it).packetlength); - if (p == 0) - { - if (!external) - delete[] buf; - ClearPacketList(); - return ERR_RTP_OUTOFMEM; - } rtcppacklist.push_back(p); curbuf += (*it).packetlength; diff --git a/qrtplib/rtcpcompoundpacketbuilder.h b/qrtplib/rtcpcompoundpacketbuilder.h index c66210ab8..7daff9dc1 100644 --- a/qrtplib/rtcpcompoundpacketbuilder.h +++ b/qrtplib/rtcpcompoundpacketbuilder.h @@ -296,8 +296,6 @@ private: int AddSSRC(uint32_t ssrc) { SDESSource *s = new SDESSource(ssrc); - if (s == 0) - return ERR_RTP_OUTOFMEM; sdessources.push_back(s); sdesit = sdessources.end(); sdesit--; diff --git a/qrtplib/rtcppacketbuilder.cpp b/qrtplib/rtcppacketbuilder.cpp index c4b2ff543..70cd75cd1 100644 --- a/qrtplib/rtcppacketbuilder.cpp +++ b/qrtplib/rtcppacketbuilder.cpp @@ -111,8 +111,6 @@ int RTCPPacketBuilder::BuildNextPacket(RTCPCompoundPacket **pack) *pack = 0; rtcpcomppack = new RTCPCompoundPacketBuilder(); - if (rtcpcomppack == 0) - return ERR_RTP_OUTOFMEM; if ((status = rtcpcomppack->InitBuild(maxpacketsize)) < 0) { @@ -640,8 +638,6 @@ int RTCPPacketBuilder::BuildBYEPacket(RTCPCompoundPacket **pack, const void *rea *pack = 0; rtcpcomppack = new RTCPCompoundPacketBuilder(); - if (rtcpcomppack == 0) - return ERR_RTP_OUTOFMEM; if ((status = rtcpcomppack->InitBuild(maxpacketsize)) < 0) { diff --git a/qrtplib/rtcpscheduler.cpp b/qrtplib/rtcpscheduler.cpp index 31f7a8bb1..9d19ec038 100644 --- a/qrtplib/rtcpscheduler.cpp +++ b/qrtplib/rtcpscheduler.cpp @@ -87,6 +87,11 @@ int RTCPSchedulerParams::SetMinimumTransmissionInterval(const RTPTime &t) RTCPScheduler::RTCPScheduler(RTPSources &s, RTPRandom &r) : sources(s), nextrtcptime(0, 0), prevrtcptime(0, 0), rtprand(r) { + pmembers = 0; + byemembers = 0; + pbyemembers = 0; + avgbyepacketsize = 0; + Reset(); //std::cout << (void *)(&rtprand) << std::endl; diff --git a/qrtplib/rtcpsdesinfo.h b/qrtplib/rtcpsdesinfo.h index 16e9e2ab9..f46bfbddf 100644 --- a/qrtplib/rtcpsdesinfo.h +++ b/qrtplib/rtcpsdesinfo.h @@ -230,8 +230,6 @@ private: { len = (len > RTCP_SDES_MAXITEMLENGTH) ? RTCP_SDES_MAXITEMLENGTH : len; uint8_t *str2 = new uint8_t[len]; - if (str2 == 0) - return ERR_RTP_OUTOFMEM; memcpy(str2, s, len); *destlen = len; if (*dest) diff --git a/qrtplib/rtpkeyhashtable.h b/qrtplib/rtpkeyhashtable.h index ef0386b16..cfba38d7c 100644 --- a/qrtplib/rtpkeyhashtable.h +++ b/qrtplib/rtpkeyhashtable.h @@ -297,8 +297,6 @@ inline int RTPKeyHashTable::AddElement(const K // Okay, the key doesn't exist, so we can add the new element in the hash table newelem = new HashElement(k, elem, index); - if (newelem == 0) - return ERR_RTP_OUTOFMEM; e = table[index]; table[index] = newelem; diff --git a/qrtplib/rtpudptransmitter.cpp b/qrtplib/rtpudptransmitter.cpp index bcca9c584..4b1d1ff1c 100644 --- a/qrtplib/rtpudptransmitter.cpp +++ b/qrtplib/rtpudptransmitter.cpp @@ -541,15 +541,11 @@ bool RTPUDPTransmitter::ShouldAcceptData(const RTPAddress& rtpAddress) std::list::iterator findIt = std::find(m_acceptList.begin(), m_acceptList.end(), rtpAddress); return findIt != m_acceptList.end(); } - else if (m_receivemode == RTPTransmitter::IgnoreSome) + else // this is RTPTransmitter::IgnoreSome { std::list::iterator findIt = std::find(m_ignoreList.begin(), m_ignoreList.end(), rtpAddress); return findIt == m_ignoreList.end(); } - else - { - return false; - } } } // namespace diff --git a/sdrbase/audio/audiofifo.cpp b/sdrbase/audio/audiofifo.cpp index ba9fe589e..2cade6829 100644 --- a/sdrbase/audio/audiofifo.cpp +++ b/sdrbase/audio/audiofifo.cpp @@ -266,5 +266,5 @@ bool AudioFifo::create(uint32_t numSamples) m_fifo = new qint8[numSamples * m_sampleSize]; m_size = numSamples; - return m_fifo != 0; + return true; } diff --git a/sdrbase/audio/audionetsink.cpp b/sdrbase/audio/audionetsink.cpp index 5b7afd47d..70c7dac0f 100644 --- a/sdrbase/audio/audionetsink.cpp +++ b/sdrbase/audio/audionetsink.cpp @@ -29,6 +29,7 @@ AudioNetSink::AudioNetSink(QObject *parent) : m_bufferIndex(0), m_port(9998) { + memset(m_data, 0, 65536); m_udpSocket = new QUdpSocket(parent); } @@ -38,6 +39,7 @@ AudioNetSink::AudioNetSink(QObject *parent, int sampleRate, bool stereo) : m_bufferIndex(0), m_port(9998) { + memset(m_data, 0, 65536); m_udpSocket = new QUdpSocket(parent); m_rtpBufferAudio = new RTPSink(m_udpSocket, sampleRate, stereo); } @@ -61,17 +63,13 @@ bool AudioNetSink::selectType(SinkType type) if (type == SinkUDP) { m_type = SinkUDP; - return true; } - else if (type == SinkRTP) + else // this is SinkRTP { m_type = SinkRTP; - return true; - } - else - { - return false; } + + return true; } void AudioNetSink::setDestination(const QString& address, uint16_t port) diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp index 6f5146621..1b82f5e15 100644 --- a/sdrgui/mainwindow.cpp +++ b/sdrgui/mainwindow.cpp @@ -90,7 +90,7 @@ MainWindow::MainWindow(qtwebapp::LoggerWithFile *logger, const MainParser& parse m_settings(), m_masterTabIndex(0), m_dspEngine(DSPEngine::instance()), - m_lastEngineState((DSPDeviceSourceEngine::State)-1), + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), m_inputGUI(0), m_sampleRate(0), m_centerFrequency(0), diff --git a/sdrsrv/maincore.cpp b/sdrsrv/maincore.cpp index 340837cb8..3782e7dc6 100644 --- a/sdrsrv/maincore.cpp +++ b/sdrsrv/maincore.cpp @@ -53,7 +53,7 @@ MainCore::MainCore(qtwebapp::LoggerWithFile *logger, const MainParser& parser, Q m_settings(), m_masterTabIndex(-1), m_dspEngine(DSPEngine::instance()), - m_lastEngineState((DSPDeviceSourceEngine::State)-1), + m_lastEngineState(DSPDeviceSourceEngine::StNotStarted), m_logger(logger) { qDebug() << "MainCore::MainCore: start";