mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-12-22 17:45:48 -05:00
Quiet more warnings.
This commit is contained in:
parent
0311f64527
commit
3717af3f43
@ -9,7 +9,7 @@ project(sdrangelove)
|
||||
set(CMAKE_BUILD_TYPE "Release")
|
||||
#set(CMAKE_BUILD_TYPE "ReleaseWithDebugInfo")
|
||||
#set(CMAKE_BUILD_TYPE "Debug")
|
||||
#add_definitions(-Wall -fno-strict-aliasing)
|
||||
add_definitions(-Wall -fno-strict-aliasing)
|
||||
|
||||
|
||||
set(QT_USE_QTOPENGL TRUE)
|
||||
|
@ -95,10 +95,10 @@ private:
|
||||
|
||||
AudioVector m_audioBuffer;
|
||||
uint m_audioBufferFill;
|
||||
AudioFifo* m_audioFifo;
|
||||
|
||||
SampleSink* m_sampleSink;
|
||||
SampleVector m_sampleBuffer;
|
||||
AudioFifo* m_audioFifo;
|
||||
};
|
||||
|
||||
#endif // INCLUDE_NFMDEMOD_H
|
||||
|
@ -84,12 +84,12 @@ private:
|
||||
Real m_sampleDistanceRemain;
|
||||
fftfilt* SSBFilter;
|
||||
|
||||
SampleSink* m_sampleSink;
|
||||
SampleVector m_sampleBuffer;
|
||||
|
||||
AudioVector m_audioBuffer;
|
||||
uint m_audioBufferFill;
|
||||
AudioFifo* m_audioFifo;
|
||||
|
||||
SampleSink* m_sampleSink;
|
||||
SampleVector m_sampleBuffer;
|
||||
};
|
||||
|
||||
#endif // INCLUDE_SSBDEMOD_H
|
||||
|
@ -269,7 +269,7 @@ void TCPSrcGUI::addConnection(quint32 id, const QHostAddress& peerAddress, int p
|
||||
void TCPSrcGUI::delConnection(quint32 id)
|
||||
{
|
||||
for(int i = 0; i < ui->connections->topLevelItemCount(); i++) {
|
||||
if(ui->connections->topLevelItem(i)->type() == id) {
|
||||
if(ui->connections->topLevelItem(i)->type() == (int)id) {
|
||||
delete ui->connections->topLevelItem(i);
|
||||
ui->connectedClientsBox->setWindowTitle(tr("Connected Clients (%1)").arg(ui->connections->topLevelItemCount()));
|
||||
return;
|
||||
|
@ -45,6 +45,7 @@ private slots:
|
||||
private:
|
||||
Ui::TCPSrcGUI* ui;
|
||||
PluginAPI* m_pluginAPI;
|
||||
TCPSrc* m_tcpSrc;
|
||||
ChannelMarker* m_channelMarker;
|
||||
|
||||
// settings
|
||||
@ -57,7 +58,6 @@ private:
|
||||
// RF path
|
||||
ThreadedSampleSink* m_threadedSampleSink;
|
||||
Channelizer* m_channelizer;
|
||||
TCPSrc* m_tcpSrc;
|
||||
SpectrumVis* m_spectrumVis;
|
||||
|
||||
explicit TCPSrcGUI(PluginAPI* pluginAPI, QWidget* parent = NULL);
|
||||
|
@ -81,11 +81,11 @@ private:
|
||||
|
||||
AudioVector m_audioBuffer;
|
||||
uint m_audioBufferFill;
|
||||
AudioFifo* m_audioFifo;
|
||||
fftfilt* USBFilter;
|
||||
|
||||
SampleSink* m_sampleSink;
|
||||
SampleVector m_sampleBuffer;
|
||||
AudioFifo* m_audioFifo;
|
||||
};
|
||||
|
||||
#endif // INCLUDE_USBDEMOD_H
|
||||
|
@ -78,15 +78,15 @@ private:
|
||||
NCO m_nco;
|
||||
Interpolator m_interpolator;
|
||||
Real m_sampleDistanceRemain;
|
||||
|
||||
Complex m_lastSample;
|
||||
|
||||
AudioVector m_audioBuffer;
|
||||
uint m_audioBufferFill;
|
||||
AudioFifo* m_audioFifo;
|
||||
|
||||
SampleSink* m_sampleSink;
|
||||
SampleVector m_sampleBuffer;
|
||||
|
||||
AudioFifo* m_audioFifo;
|
||||
};
|
||||
|
||||
#endif // INCLUDE_WFMDEMOD_H
|
||||
|
@ -35,23 +35,12 @@ void V4LPlugin::initPlugin(PluginAPI* pluginAPI)
|
||||
PluginInterface::SampleSourceDevices V4LPlugin::enumSampleSources()
|
||||
{
|
||||
SampleSourceDevices result;
|
||||
int count = 1; //rtlsdr_get_device_count();
|
||||
char vendor[256];
|
||||
char product[256];
|
||||
char serial[256];
|
||||
|
||||
for(int i = 0; i < count; i++) {
|
||||
vendor[0] = '\0';
|
||||
product[0] = '\0';
|
||||
serial[0] = '\0';
|
||||
QString displayedName(QString("Kernel Source #1"));
|
||||
SimpleSerializer s(1);
|
||||
s.writeS32(1, 0);
|
||||
result.append(SampleSourceDevice(displayedName, "org.osmocom.sdr.samplesource.v4l", s.final()));
|
||||
|
||||
// if(rtlsdr_get_device_usb_strings((uint32_t)i, vendor, product, serial) != 0)
|
||||
// continue;
|
||||
QString displayedName(QString("SDR #%1").arg(i + 1));
|
||||
SimpleSerializer s(1);
|
||||
s.writeS32(1, i);
|
||||
result.append(SampleSourceDevice(displayedName, "org.osmocom.sdr.samplesource.v4l", s.final()));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
|
@ -222,17 +222,16 @@ V4LThread::work(int noutput_items)
|
||||
struct timeval tv;
|
||||
struct v4l2_buffer buf;
|
||||
fd_set fds;
|
||||
unsigned int i, items = 0;
|
||||
qint16 xreal, yimag;
|
||||
uint8_t* b;
|
||||
SampleVector::iterator it;
|
||||
|
||||
int pos = 0;
|
||||
unsigned int pos = 0;
|
||||
// in is 4*8bit*2(IQ), 8 bytes; out is 1*16bit*2(IQ) , 4bytes
|
||||
it = m_convertBuffer.begin();
|
||||
if (recebuf_len > 0) {
|
||||
b = (uint8_t *) recebuf_ptr;
|
||||
int len = noutput_items * 8;
|
||||
unsigned int len = noutput_items * 8;
|
||||
if (len > recebuf_len)
|
||||
len = recebuf_len;
|
||||
for (pos = 0; pos < len - 7; pos += 8) {
|
||||
|
@ -669,7 +669,7 @@ bool SimpleDeserializer::parseAll()
|
||||
|
||||
readOfs += length;
|
||||
|
||||
if(readOfs == m_data.size())
|
||||
if(readOfs == (uint)m_data.size())
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
Loading…
Reference in New Issue
Block a user