From b35b3d2c1bbe40c06abedd4fb8c1bcc2627b3dfd Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Tue, 19 Jul 2022 10:43:51 +0100 Subject: [PATCH] Fix gcc warnings --- plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp | 5 ++++- .../samplesource/remotetcpinput/remotetcpinputtcphandler.cpp | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp b/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp index fb392b8e5..f49b208df 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp +++ b/plugins/samplesource/remotetcpinput/remotetcpinputgui.cpp @@ -41,9 +41,9 @@ RemoteTCPInputGui::RemoteTCPInputGui(DeviceUISet *deviceUISet, QWidget* parent) ui(new Ui::RemoteTCPInputGui), m_settings(), m_sampleSource(0), + m_lastEngineState(DeviceAPI::StNotStarted), m_sampleRate(0), m_centerFrequency(0), - m_lastEngineState(DeviceAPI::StNotStarted), m_doApplySettings(true), m_forceSettings(true), m_deviceGains(nullptr), @@ -171,6 +171,7 @@ bool RemoteTCPInputGui::handleMessage(const Message& message) ui->outGauge->setMaximum((int)report.getOutSize()); ui->outGauge->setValue((int)report.getOutBytesAvailable()); ui->outBufferLenSecsText->setText(QString("%1s").arg(report.getOutSeconds(), 0, 'f', 2)); + return true; } else if (RemoteTCPInputTCPHandler::MsgReportRemoteDevice::match(message)) { @@ -259,6 +260,7 @@ bool RemoteTCPInputGui::handleMessage(const Message& message) ui->decimation->setEnabled(sdra); displayGains(); + return true; } else if (RemoteTCPInputTCPHandler::MsgReportConnection::match(message)) { @@ -274,6 +276,7 @@ bool RemoteTCPInputGui::handleMessage(const Message& message) m_connectionError = true; ui->startStop->setStyleSheet("QToolButton { background-color : red; }"); } + return true; } else { diff --git a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp index 2b9650f30..25ed2e98e 100644 --- a/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp +++ b/plugins/samplesource/remotetcpinput/remotetcpinputtcphandler.cpp @@ -437,7 +437,7 @@ void RemoteTCPInputTCPHandler::applySettings(const RemoteTCPInputSettings& setti { // Resize FIFO to give us 1 second // Can't do this while running - if (!m_running && settings.m_channelSampleRate > m_sampleFifo->size()) + if (!m_running && settings.m_channelSampleRate > (qint32)m_sampleFifo->size()) { qDebug() << "RemoteTCPInputTCPHandler::applySettings: Resizing sample FIFO from " << m_sampleFifo->size() << "to" << settings.m_channelSampleRate; m_sampleFifo->setSize(settings.m_channelSampleRate); @@ -522,7 +522,7 @@ void RemoteTCPInputTCPHandler::dataReadyRead() if (!m_readMetaData) { quint8 metaData[RemoteTCPProtocol::m_sdraMetaDataSize]; - if (m_dataSocket->bytesAvailable() >= sizeof(metaData)) + if (m_dataSocket->bytesAvailable() >= (qint64)sizeof(metaData)) { qint64 bytesRead = m_dataSocket->read((char *)&metaData[0], 4); if (bytesRead == 4) @@ -539,7 +539,6 @@ void RemoteTCPInputTCPHandler::dataReadyRead() bytesRead = m_dataSocket->read((char *)&metaData[4], RemoteTCPProtocol::m_rtl0MetaDataSize-4); RemoteTCPProtocol::Device tuner = (RemoteTCPProtocol::Device)RemoteTCPProtocol::extractUInt32(&metaData[4]); - quint32 gainStages = RemoteTCPProtocol::extractUInt32(&metaData[8]); if (m_messageQueueToGUI) { m_messageQueueToGUI->push(MsgReportRemoteDevice::create(tuner, protocol)); }