VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-22 16:08:39 -05:00
Code Issues Projects Releases Wiki Activity

Fixed remaining warnings

Browse Source
This commit is contained in:
f4exb 2020-11-15 12:02:04 +01:00
parent 82f98ab6c1
commit 696c6c9379
11 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channelrx/sigmffilesink/sigmffilesink.cpp
View File

@ -50,9 +50,9 @@ const QString SigMFFileSink::m_channelId = "SigMFFileSink";
SigMFFileSink::SigMFFileSink(DeviceAPI *deviceAPI) : SigMFFileSink::SigMFFileSink(DeviceAPI *deviceAPI) :
ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink), ChannelAPI(m_channelIdURI, ChannelAPI::StreamSingleSink),
m_deviceAPI(deviceAPI), m_deviceAPI(deviceAPI),
m_spectrumVis(SDR_RX_SCALEF),
m_centerFrequency(0), m_centerFrequency(0),
m_frequencyOffset(0), m_frequencyOffset(0),
m_spectrumVis(SDR_RX_SCALEF),
m_basebandSampleRate(48000) m_basebandSampleRate(48000)
{ {
setObjectName(m_channelId); setObjectName(m_channelId);

2
plugins/channelrx/sigmffilesink/sigmffilesinkbaseband.cpp
View File

@ -30,10 +30,10 @@ MESSAGE_CLASS_DEFINITION(SigMFFileSinkBaseband::MsgConfigureSigMFFileSinkBaseban
MESSAGE_CLASS_DEFINITION(SigMFFileSinkBaseband::MsgConfigureSigMFFileSinkWork, Message) MESSAGE_CLASS_DEFINITION(SigMFFileSinkBaseband::MsgConfigureSigMFFileSinkWork, Message)
SigMFFileSinkBaseband::SigMFFileSinkBaseband() : SigMFFileSinkBaseband::SigMFFileSinkBaseband() :
m_running(false),
m_specMax(0), m_specMax(0),
m_squelchLevel(0), m_squelchLevel(0),
m_squelchOpen(false), m_squelchOpen(false),
m_running(false),
m_mutex(QMutex::Recursive) m_mutex(QMutex::Recursive)
{ {
m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000)); m_sampleFifo.setSize(SampleSinkFifo::getSizePolicy(48000));

6
plugins/channelrx/sigmffilesink/sigmffilesinksink.cpp
View File

@ -25,10 +25,10 @@
#include "sigmffilesinksink.h" #include "sigmffilesinksink.h"
SigMFFileSinkSink::SigMFFileSinkSink() : SigMFFileSinkSink::SigMFFileSinkSink() :
m_spectrumSink(nullptr),
m_msgQueueToGUI(nullptr),
m_preRecordBuffer(48000), m_preRecordBuffer(48000),
m_preRecordFill(0), m_preRecordFill(0),
m_spectrumSink(nullptr),
m_msgQueueToGUI(nullptr),
m_recordEnabled(false), m_recordEnabled(false),
m_record(false), m_record(false),
m_squelchOpen(false), m_squelchOpen(false),
@ -192,7 +192,7 @@ void SigMFFileSinkSink::applyChannelSettings(
for (int i = 0; i < 7; i++) // find log2 beween 0 and 6 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; qDebug() << "SigMFFileSinkSink::applyChannelSettings: log2decim: " << i;
m_decimator.setLog2Decim(i); m_decimator.setLog2Decim(i);

3
plugins/samplesource/sigmffileinput/sigmffileinput.cpp
View File

@ -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()) { if (trackIndex < m_captureStarts.size()) {
return m_captureStarts[trackIndex]; return m_captureStarts[trackIndex];
@ -1094,7 +1094,6 @@ void SigMFFileInput::webapiFormatDeviceReport(SWGSDRangel::SWGDeviceReport& resp
unsigned int sampleRate = m_captures[m_currentTrackIndex].m_sampleRate; unsigned int sampleRate = m_captures[m_currentTrackIndex].m_sampleRate;
uint64_t trackSamplesCount = totalSamplesCount - m_captures[m_currentTrackIndex].m_sampleStart; 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 startingTimeStampMs = m_captures[m_currentTrackIndex].m_tsms;
uint64_t t = (trackSamplesCount*1000)/sampleRate; uint64_t t = (trackSamplesCount*1000)/sampleRate;

2
plugins/samplesource/sigmffileinput/sigmffileinput.h
View File

@ -484,7 +484,7 @@ private:
sigmf::Annotation<core::DescrT> >* metaRecord sigmf::Annotation<core::DescrT> >* metaRecord
); );
static void analyzeDataType(const std::string& dataTypeString, SigMFFileDataType& dataType); 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); int getTrackIndex(uint64_t sampleIndex);
void seekFileStream(uint64_t sampleIndex); void seekFileStream(uint64_t sampleIndex);
void seekTrackMillis(int seekMillis); void seekTrackMillis(int seekMillis);

3
plugins/samplesource/sigmffileinput/sigmffileinputgui.cpp
View File

@ -350,7 +350,6 @@ QString SigMFFileInputGUI::displayScaled(uint64_t value, int precision)
void SigMFFileInputGUI::addCaptures(const QList<SigMFFileCapture>& captures) void SigMFFileInputGUI::addCaptures(const QList<SigMFFileCapture>& captures)
{ {
ui->captureTable->setRowCount(captures.size()); ui->captureTable->setRowCount(captures.size());
QList<SigMFFileCapture>::const_iterator it = captures.begin();
for (int i = 0; i < captures.size(); i++) 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); RecordInfoDialog infoDialog(m_recordInfo, this);
infoDialog.exec(); infoDialog.exec();

2
plugins/samplesource/sigmffileinput/sigmffileinputgui.h
View File

@ -98,7 +98,7 @@ private:
private slots: private slots:
void handleInputMessages(); void handleInputMessages();
void on_startStop_toggled(bool checked); void on_startStop_toggled(bool checked);
void on_infoDetails_clicked(bool checked); void on_infoDetails_clicked();
void on_captureTable_itemSelectionChanged(); void on_captureTable_itemSelectionChanged();
void on_trackNavTimeSlider_valueChanged(int value); void on_trackNavTimeSlider_valueChanged(int value);
void on_playTrack_toggled(bool checked); void on_playTrack_toggled(bool checked);

4
plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp
View File

@ -111,7 +111,7 @@ void SigMFFileInputWorker::setTrackIndex(int trackIndex)
{ {
m_currentTrackIndex = trackIndex; m_currentTrackIndex = trackIndex;
m_samplesCount = m_captures->at(m_currentTrackIndex).m_sampleStart; 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) if (sampleRate != m_samplerate)
{ {
@ -222,7 +222,7 @@ void SigMFFileInputWorker::tick()
&& (m_samplesCount > m_captures->at(m_currentTrackIndex+1).m_sampleStart)) && (m_samplesCount > m_captures->at(m_currentTrackIndex+1).m_sampleStart))
{ {
m_currentTrackIndex++; 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) if (sampleRate != m_samplerate)
{ {

1
sdrbase/dsp/nullsink.h
View File

@ -13,6 +13,7 @@ public:
virtual ~NullSink(); virtual ~NullSink();
virtual bool init(const Message& cmd); 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 feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
virtual void start(); virtual void start();
virtual void stop(); virtual void stop();

1
sdrbase/resources/webapi.qrc
View File

@ -62,7 +62,6 @@
<file>webapi/doc/swagger/include/Preferences.yaml</file> <file>webapi/doc/swagger/include/Preferences.yaml</file>
<file>webapi/doc/swagger/include/Preset.yaml</file> <file>webapi/doc/swagger/include/Preset.yaml</file>
<file>webapi/doc/swagger/include/RtlSdr.yaml</file> <file>webapi/doc/swagger/include/RtlSdr.yaml</file>
<file>webapi/doc/swagger/include/RigCtlServer.yaml</file>
<file>webapi/doc/swagger/include/RemoteSink.yaml</file> <file>webapi/doc/swagger/include/RemoteSink.yaml</file>
<file>webapi/doc/swagger/include/RemoteSource.yaml</file> <file>webapi/doc/swagger/include/RemoteSource.yaml</file>
<file>webapi/doc/swagger/include/RemoteInput.yaml</file> <file>webapi/doc/swagger/include/RemoteInput.yaml</file>

1
sdrgui/gui/doublevalidator.h
View File

@ -29,6 +29,7 @@ public:
{ {
} }
using QDoubleValidator::validate;
QValidator::State validate(QString &s) const QValidator::State validate(QString &s) const
{ {
if (s.isEmpty() || s == "-") { if (s.isEmpty() || s == "-") {