VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

Fix compilation warnings and errors

Browse Source
This commit is contained in:
DreamNik
2024-09-03 18:38:32 +03:00
parent 027d6af6bb
commit f694ba04b8
104 changed files with 108 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/sigmffileinput/sigmffiledata.h
+4 -2
View File
@@ -64,8 +64,9 @@ struct SigMFFileDataType
}
};
struct SigMFFileMetaInfo
class SigMFFileMetaInfo
{
public:
// core
QString m_dataTypeStr;
SigMFFileDataType m_dataType;
@@ -153,8 +154,9 @@ struct SigMFFileMetaInfo
}
};
struct SigMFFileCapture
class SigMFFileCapture
{
public:
uint64_t m_tsms; //!< Unix timestamp in milliseconds
uint64_t m_centerFrequency; //!< Center frequency in Hz
uint64_t m_sampleStart; //!< Sample index at which capture start
plugins/samplesource/sigmffileinput/sigmffileinputworker.cpp
+6 -6
View File
@@ -625,8 +625,8 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
nbSamples = nbBytes / (2 * m_samplebytes);
for (int is = 0; is < nbSamples; is++)
{
convertBuf[2*is] = fileBuf[2*is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16;
convertBuf[2*is+1] = fileBuf[2*is+1] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16;
convertBuf[2*is] = fileBuf[2*is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16);
convertBuf[2*is+1] = fileBuf[2*is+1] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16);
}
}
else
@@ -634,7 +634,7 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
nbSamples = nbBytes / m_samplebytes;
for (int is = 0; is < nbSamples; is++)
{
convertBuf[2*is] = fileBuf[is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16;
convertBuf[2*is] = fileBuf[is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16);
convertBuf[2*is+1] = 0;
}
}
@@ -715,9 +715,9 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
nbSamples = nbBytes / (2 * m_samplebytes);
for (int is = 0; is < nbSamples; is++)
{
convertBuf[2*is] = (fileBuf[2*is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16)
convertBuf[2*is] = (fileBuf[2*is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16))
- ((SDR_RX_SAMP_SZ == 24) ? (1<<23) : (1<<15));
convertBuf[2*is+1] = (fileBuf[2*is+1] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16)
convertBuf[2*is+1] = (fileBuf[2*is+1] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16))
- ((SDR_RX_SAMP_SZ == 24) ? (1<<23) : (1<<15));;
}
}
@@ -726,7 +726,7 @@ void SigMFFileInputWorker::writeToSampleFifoBAK(const quint8* buf, qint32 nbByte
nbSamples = nbBytes / m_samplebytes;
for (int is = 0; is < nbSamples; is++)
{
convertBuf[2*is] = (fileBuf[is] >> (SDR_RX_SAMP_SZ == 24) ? 8 : 16)
convertBuf[2*is] = (fileBuf[is] >> ((SDR_RX_SAMP_SZ == 24) ? 8 : 16))
- ((SDR_RX_SAMP_SZ == 24) ? (1<<23) : (1<<15));
convertBuf[2*is+1] = 0;
}