VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-16 20:58:45 -04:00
Code Issues Projects Releases Wiki Activity

activated compiler warnings

Browse Source
This commit is contained in:
f4exb
2017-05-25 20:13:34 +02:00
parent d6f62a69dd
commit 3a3d8e3dcb
157 changed files with 655 additions and 772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/sdrdaemon/sdrdaemonbuffer.cpp
+5 -6
View File
@@ -95,7 +95,7 @@ SDRdaemonBuffer::~SDRdaemonBuffer()
void SDRdaemonBuffer::updateBufferSize(uint32_t sampleRate)
{
uint32_t rawSize = sampleRate * m_iqSampleSize * m_rawBufferLengthSeconds; // store worth of this seconds of samples at this sample rate
int rawSize = sampleRate * m_iqSampleSize * m_rawBufferLengthSeconds; // store worth of this seconds of samples at this sample rate
if ((m_frameSize > 0) && (rawSize / m_frameSize < m_rawBufferMinNbFrames))
{
@@ -148,9 +148,8 @@ void SDRdaemonBuffer::updateReadBufferSize(uint32_t length)
m_readBuffer = new uint8_t[length];
}
bool SDRdaemonBuffer::readMeta(char *array, uint32_t length)
bool SDRdaemonBuffer::readMeta(char *array)
{
assert(length >= sizeof(MetaData) + 8);
MetaData *metaData = (MetaData *) array;
if (m_crc64.calculate_crc((uint8_t *) array, sizeof(MetaData) - 8) == metaData->m_crc)
@@ -183,7 +182,7 @@ bool SDRdaemonBuffer::readMeta(char *array, uint32_t length)
{
m_sampleBytes = metaData->m_sampleBytes & 0x0F;
uint32_t frameSize = m_iqSampleSize * metaData->m_nbSamples * metaData->m_nbBlocks;
int sampleRate = metaData->m_sampleRate;
uint32_t sampleRate = metaData->m_sampleRate;
if (sampleRate != m_sampleRateStream) // change of nominal stream sample rate
{
@@ -337,7 +336,7 @@ uint8_t *SDRdaemonBuffer::readData(int32_t length)
}
}
void SDRdaemonBuffer::writeDataLZ4(const char *array, uint32_t length)
void SDRdaemonBuffer::writeDataLZ4(const char *array, int length)
{
if (m_lz4InCount + length < m_lz4InSize)
{
@@ -394,7 +393,7 @@ void SDRdaemonBuffer::writeToRawBufferLZ4()
}
}
void SDRdaemonBuffer::writeToRawBufferUncompressed(const char *array, uint32_t length)
void SDRdaemonBuffer::writeToRawBufferUncompressed(const char *array, int length)
{
// TODO: handle the 1 byte per I or Q sample
if (m_writeIndex + length < m_rawSize)
plugins/samplesource/sdrdaemon/sdrdaemonbuffer.h
+7 -7
View File
@@ -63,7 +63,7 @@ public:
SDRdaemonBuffer(uint32_t throttlems);
~SDRdaemonBuffer();
bool readMeta(char *array, uint32_t length); //!< Attempt to read meta. Returns true if meta block
bool readMeta(char *array); //!< Attempt to read meta. Returns true if meta block
void writeData(char *array, uint32_t length); //!< Write data into buffer.
uint8_t *readData(int32_t length);
void updateBlockCounts(uint32_t nbBytesReceived);
@@ -118,15 +118,15 @@ private:
void updateBufferSize(uint32_t sampleRate);
void updateLZ4Sizes(uint32_t frameSize);
void updateReadBufferSize(uint32_t length);
void writeDataLZ4(const char *array, uint32_t length);
void writeDataLZ4(const char *array, int length);
void writeToRawBufferLZ4();
void writeToRawBufferUncompressed(const char *array, uint32_t length);
void writeToRawBufferUncompressed(const char *array, int length);
void resetIndexes();
static void printMeta(const QString& header, MetaData *metaData);
uint32_t m_throttlemsNominal; //!< Initial throttle in ms
uint32_t m_rawSize; //!< Size of the raw samples buffer in bytes
int m_rawSize; //!< Size of the raw samples buffer in bytes
uint8_t *m_rawBuffer; //!< Buffer for raw samples obtained from UDP (I/Q not in a formal I/Q structure)
uint32_t m_sampleRateStream; //!< Current sample rate from the stream meta data
uint32_t m_sampleRate; //!< Current actual sample rate in Hz
@@ -142,8 +142,8 @@ private:
uint32_t m_bytesInBlock; //!< Number of bytes received in the current UDP block
uint64_t m_dataCRC; //!< CRC64 of the data block
uint32_t m_inCount; //!< Current position of uncompressed input
uint32_t m_lz4InCount; //!< Current position in LZ4 input buffer
uint32_t m_lz4InSize; //!< Size in bytes of the LZ4 input data
int m_lz4InCount; //!< Current position in LZ4 input buffer
int m_lz4InSize; //!< Size in bytes of the LZ4 input data
uint8_t *m_lz4InBuffer; //!< Buffer for LZ4 compressed input
uint8_t *m_lz4OutBuffer; //!< Buffer for LZ4 uncompressed output
uint32_t m_frameSize; //!< Size in bytes of one uncompressed frame
@@ -156,7 +156,7 @@ private:
int32_t m_writeIndex; //!< Current write position in the raw samples buffer
int32_t m_readIndex; //!< Current read position in the raw samples buffer
uint32_t m_readSize; //!< Read buffer size
int m_readSize; //!< Read buffer size
uint8_t *m_readBuffer; //!< Read buffer to hold samples when looping back to beginning of raw buffer
bool m_autoFollowRate; //!< Auto follow stream sample rate else stick with meta data sample rate
plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
+12 -13
View File
@@ -75,7 +75,7 @@ SDRdaemonGui::SDRdaemonGui(DeviceSourceAPI *deviceAPI, QWidget* parent) :
m_sender = nn_socket(AF_SP, NN_PAIR);
assert(m_sender != -1);
int millis = 500;
int rc = nn_setsockopt (m_sender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis));
nn_setsockopt (m_sender, NN_SOL_SOCKET, NN_SNDTIMEO, &millis, sizeof (millis));
assert (rc == 0);
m_startingTimeStamp.tv_sec = 0;
@@ -189,7 +189,6 @@ bool SDRdaemonGui::deserialize(const QByteArray& data)
{
SimpleDeserializer d(data);
QString address;
uint32_t uintval;
quint16 dataPort;
bool dcBlock;
bool iqCorrection;
@@ -401,7 +400,7 @@ void SDRdaemonGui::displayConfigurationParameters(uint32_t freq,
ui->specificParms->setCursorPosition(0);
}
void SDRdaemonGui::on_applyButton_clicked(bool checked)
void SDRdaemonGui::on_applyButton_clicked(bool checked __attribute__((unused)))
{
bool dataOk, ctlOk;
QString udpAddress = ui->address->text();
@@ -432,7 +431,7 @@ void SDRdaemonGui::on_applyButton_clicked(bool checked)
ui->applyButton->setEnabled(false);
}
void SDRdaemonGui::on_sendButton_clicked(bool checked)
void SDRdaemonGui::on_sendButton_clicked(bool checked __attribute__((unused)))
{
sendConfiguration();
ui->specificParms->setCursorPosition(0);
@@ -500,19 +499,19 @@ void SDRdaemonGui::sendConfiguration()
}
}
void SDRdaemonGui::on_address_textEdited(const QString& arg1)
void SDRdaemonGui::on_address_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->applyButton->setEnabled(true);
m_addressEdited = true;
}
void SDRdaemonGui::on_dataPort_textEdited(const QString& arg1)
void SDRdaemonGui::on_dataPort_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->applyButton->setEnabled(true);
m_dataPortEdited = true;
}
void SDRdaemonGui::on_controlPort_textEdited(const QString& arg1)
void SDRdaemonGui::on_controlPort_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->applyButton->setEnabled(true);
}
@@ -551,33 +550,33 @@ void SDRdaemonGui::on_autoCorrBuffer_toggled(bool checked)
}
}
void SDRdaemonGui::on_resetIndexes_clicked(bool checked)
void SDRdaemonGui::on_resetIndexes_clicked(bool checked __attribute__((unused)))
{
SDRdaemonInput::MsgConfigureSDRdaemonResetIndexes* message = SDRdaemonInput::MsgConfigureSDRdaemonResetIndexes::create();
m_sampleSource->getInputMessageQueue()->push(message);
}
void SDRdaemonGui::on_freq_textEdited(const QString& arg1)
void SDRdaemonGui::on_freq_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonGui::on_sampleRate_textEdited(const QString& arg1)
void SDRdaemonGui::on_sampleRate_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonGui::on_specificParms_textEdited(const QString& arg1)
void SDRdaemonGui::on_specificParms_textEdited(const QString& arg1 __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonGui::on_decim_currentIndexChanged(int index)
void SDRdaemonGui::on_decim_currentIndexChanged(int index __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
void SDRdaemonGui::on_fcPos_currentIndexChanged(int index)
void SDRdaemonGui::on_fcPos_currentIndexChanged(int index __attribute__((unused)))
{
ui->sendButton->setEnabled(true);
}
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp
+1 -1
View File
@@ -149,7 +149,7 @@ void SDRdaemonUDPHandler::processData()
{
m_sdrDaemonBuffer.updateBlockCounts(m_udpReadBytes);
if (m_sdrDaemonBuffer.readMeta(m_udpBuf, m_udpReadBytes))
if (m_sdrDaemonBuffer.readMeta(m_udpBuf))
{
const SDRdaemonBuffer::MetaData& metaData = m_sdrDaemonBuffer.getCurrentMeta();
bool change = false;
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.h
+1 -1
View File
@@ -74,7 +74,7 @@ private:
uint32_t m_readLengthSamples;
uint32_t m_readLength;
bool m_throttleToggle;
int m_rateDivider;
uint32_t m_rateDivider;
bool m_autoCorrBuffer;
void setSamplerate(uint32_t samplerate);