diff --git a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp index 9c66e11d8..cc06d560d 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp @@ -50,9 +50,9 @@ const QString SigMFFileSink::m_channelId = "SigMFFileSink"; SigMFFileSink::SigMFFileSink(DeviceAPI *deviceAPI) : ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), m_deviceAPI(deviceAPI), + m_spectrumVis(SDR_RX_SCALEF), m_centerFrequency(0), m_frequencyOffset(0), - m_spectrumVis(SDR_RX_SCALEF), m_basebandSampleRate(48000) { setObjectName(m_channelId); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp index 257be5ce3..fbd54ea74 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp @@ -30,10 +30,10 @@ MESSAGE_CLASS_DEFINITION(SigMFFileSinkBaseband::MsgConfigureSigMFFileSinkBaseban MESSAGE_CLASS_DEFINITION(SigMFFileSinkBaseband::MsgConfigureSigMFFileSinkWork, Message) SigMFFileSinkBaseband::SigMFFileSinkBaseband() : - m_running(false), m_specMax(0), m_squelchLevel(0), m_squelchOpen(false), + m_running(false), m_mutex(QMutex::Recursive) { m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinksink.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinksink.cpp index 2d405c615..cba0896ed 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinksink.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinksink.cpp @@ -25,10 +25,10 @@ #include "sigmffilesinksink.h" SigMFFileSinkSink::SigMFFileSinkSink() : - m_spectrumSink(nullptr), - m_msgQueueToGUI(nullptr), m_preRecordBuffer(48000), m_preRecordFill(0), + m_spectrumSink(nullptr), + m_msgQueueToGUI(nullptr), m_recordEnabled(false), m_record(false), m_squelchOpen(false), @@ -192,7 +192,7 @@ void SigMFFileSinkSink::applyChannelSettings( for (int i = 0; i < 7; i++) // find log2 beween 0 and 6 { - if (decim & 1 == 1) + if ((decim & 1) == 1) { qDebug() << "SigMFFileSinkSink::applyChannelSettings: log2decim: " << i; m_decimator.setLog2Decim(i); @@ -293,4 +293,4 @@ void SigMFFileSinkSink::squelchRecording(bool squelchOpen) } m_squelchOpen = squelchOpen; -} \ No newline at end of file +} diff --git a/plugins/samplesource/sigmffileinput/sigmffileinput.cpp b/plugins/samplesource/sigmffileinput/sigmffileinput.cpp index 3230ed5d5..7c509f312 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinput.cpp +++ b/plugins/samplesource/sigmffileinput/sigmffileinput.cpp @@ -391,7 +391,7 @@ void SigMFFileInput::analyzeDataType(const std::string& dataTypeString, SigMFFil } } -uint64_t SigMFFileInput::getTrackSampleStart(int trackIndex) +uint64_t SigMFFileInput::getTrackSampleStart(unsigned int trackIndex) { if (trackIndex < m_captureStarts.size()) { return m_captureStarts[trackIndex]; @@ -1094,7 +1094,6 @@ void SigMFFileInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& resp unsigned int sampleRate = m_captures[m_currentTrackIndex].m_sampleRate; uint64_t trackSamplesCount = totalSamplesCount - m_captures[m_currentTrackIndex].m_sampleStart; - uint64_t trackCumulativeTime = m_captures[m_currentTrackIndex].m_cumulativeTime; uint64_t startingTimeStampMs = m_captures[m_currentTrackIndex].m_tsms; uint64_t t = (trackSamplesCount*1000)/sampleRate; diff --git a/plugins/samplesource/sigmffileinput/sigmffileinput.h b/plugins/samplesource/sigmffileinput/sigmffileinput.h index 119bdaf8b..d886fb447 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinput.h +++ b/plugins/samplesource/sigmffileinput/sigmffileinput.h @@ -484,7 +484,7 @@ private: sigmf::Annotation >* metaRecord ); static void analyzeDataType(const std::string& dataTypeString, SigMFFileDataType& dataType); - uint64_t getTrackSampleStart(int trackIndex); + uint64_t getTrackSampleStart(unsigned int trackIndex); int getTrackIndex(uint64_t sampleIndex); void seekFileStream(uint64_t sampleIndex); void seekTrackMillis(int seekMillis); diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp index d2ad86104..66d403bed 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp @@ -350,7 +350,6 @@ QString SigMFFileInputGUI::displayScaled(uint64_t value, int precision) void SigMFFileInputGUI::addCaptures(const QList& captures) { ui->captureTable->setRowCount(captures.size()); - QList::const_iterator it = captures.begin(); for (int i = 0; i < captures.size(); i++) { @@ -392,7 +391,7 @@ void SigMFFileInputGUI::on_startStop_toggled(bool checked) } } -void SigMFFileInputGUI::on_infoDetails_clicked(bool checked) +void SigMFFileInputGUI::on_infoDetails_clicked() { RecordInfoDialog infoDialog(m_recordInfo, this); infoDialog.exec(); diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.h b/plugins/samplesource/sigmffileinput/sigmffileinputgui.h index a76f354f1..fea452537 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.h +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.h @@ -98,7 +98,7 @@ private: private slots: void handleInputMessages(); void on_startStop_toggled(bool checked); - void on_infoDetails_clicked(bool checked); + void on_infoDetails_clicked(); void on_captureTable_itemSelectionChanged(); void on_trackNavTimeSlider_valueChanged(int value); void on_playTrack_toggled(bool checked); diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp b/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp index b3704d733..f4fdc44fe 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp +++ b/plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp @@ -111,7 +111,7 @@ void SigMFFileInputWorker::setTrackIndex(int trackIndex) { m_currentTrackIndex = trackIndex; m_samplesCount = m_captures->at(m_currentTrackIndex).m_sampleStart; - unsigned int sampleRate = m_captures->at(m_currentTrackIndex).m_sampleRate; + int sampleRate = m_captures->at(m_currentTrackIndex).m_sampleRate; if (sampleRate != m_samplerate) { @@ -222,7 +222,7 @@ void SigMFFileInputWorker::tick() && (m_samplesCount > m_captures->at(m_currentTrackIndex+1).m_sampleStart)) { m_currentTrackIndex++; - unsigned int sampleRate = m_captures->at(m_currentTrackIndex).m_sampleRate; + int sampleRate = m_captures->at(m_currentTrackIndex).m_sampleRate; if (sampleRate != m_samplerate) { diff --git a/sdrbase/dsp/nullsink.h b/sdrbase/dsp/nullsink.h index 2e26af373..43f9a46b4 100644 --- a/sdrbase/dsp/nullsink.h +++ b/sdrbase/dsp/nullsink.h @@ -13,6 +13,7 @@ public: virtual ~NullSink(); virtual bool init(const Message& cmd); + using BasebandSampleSink::feed; virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly); virtual void start(); virtual void stop(); diff --git a/sdrbase/resources/webapi.qrc b/sdrbase/resources/webapi.qrc index ad7004ade..f6d580f0c 100644 --- a/sdrbase/resources/webapi.qrc +++ b/sdrbase/resources/webapi.qrc @@ -62,7 +62,6 @@ webapi/doc/swagger/include/Preferences.yaml webapi/doc/swagger/include/Preset.yaml webapi/doc/swagger/include/RtlSdr.yaml - webapi/doc/swagger/include/RigCtlServer.yaml webapi/doc/swagger/include/RemoteSink.yaml webapi/doc/swagger/include/RemoteSource.yaml webapi/doc/swagger/include/RemoteInput.yaml diff --git a/sdrgui/gui/doublevalidator.h b/sdrgui/gui/doublevalidator.h index 3d1fb6a2b..b5882e0a8 100644 --- a/sdrgui/gui/doublevalidator.h +++ b/sdrgui/gui/doublevalidator.h @@ -29,6 +29,7 @@ public: { } + using QDoubleValidator::validate; QValidator::State validate(QString &s) const { if (s.isEmpty() || s == "-") {