cmake: re-integrated -Woverloaded-virtual and fixed corresponding warnings

CMakeLists.txt

@@ -309,7 +309,7 @@ endif()
 include(FindCompiler)
 
 if (C_CLANG OR C_GCC)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wvla -ffast-math -ftree-vectorize ${EXTRA_FLAGS}")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wvla -Woverloaded-virtual -ffast-math -ftree-vectorize ${EXTRA_FLAGS}")
 elseif (C_MSVC)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w -MP ${EXTRA_FLAGS}")
 endif()

plugins/channelrx/chanalyzer/chanalyzer.h

@@ -71,7 +71,8 @@ public:
 	Real getPllDeltaPhase() const { return m_basebandSink->getPllDeltaPhase(); }
     Real getPllPhase() const { return m_basebandSink->getPllPhase(); }
 
-	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
+    using BasebandSampleSink::feed;
+    virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();
 	virtual bool handleMessage(const Message& cmd);

plugins/channelrx/demodadsb/adsbdemod.h

@@ -67,7 +67,8 @@ public:
     virtual ~ADSBDemod();
     virtual void destroy() { delete this; }
 
-    virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positive);
+    using BasebandSampleSink::feed;
+    virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
     virtual void start();
     virtual void stop();
     virtual bool handleMessage(const Message& cmd);

plugins/channelrx/demodam/amdemod.h

@@ -65,6 +65,7 @@ public:
 	virtual ~AMDemod();
 	virtual void destroy() { delete this; }
 
+    using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();

plugins/channelrx/demodatv/atvdemod.h

@@ -64,6 +64,7 @@ public:
 	virtual ~ATVDemod();
 	virtual void destroy() { delete this; }
 
+    using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();

plugins/channelrx/demodbfm/bfmdemod.h

@@ -73,6 +73,7 @@ public:
     SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
     void setBasebandMessageQueueToGUI(MessageQueue *messageQueue) { m_basebandSink->setMessageQueueToGUI(messageQueue); }
 
+    using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();

plugins/channelrx/demodchirpchat/chirpchatdemod.h

@@ -203,7 +203,8 @@ public:
 	virtual void destroy() { delete this; }
     SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
 
-	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool pO);
+    using BasebandSampleSink::feed;
+    virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();
 	virtual bool handleMessage(const Message& cmd);

plugins/channelrx/demoddatv/datvdemod.h

@@ -49,6 +49,7 @@ public:
     virtual QByteArray serialize() const { return QByteArray(); }
     virtual bool deserialize(const QByteArray& data) { (void) data; return false; }
 
+    using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();

plugins/channelrx/demoddsd/dsddemod.h

@@ -66,6 +66,7 @@ public:
 	virtual ~DSDDemod();
 	virtual void destroy() { delete this; }
 
+    using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();

plugins/channelrx/demodfreedv/freedvdemod.h

@@ -79,7 +79,8 @@ public:
 	virtual void destroy() { delete this; }
     SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
 
-	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
+    using BasebandSampleSink::feed;
+    virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();
 	virtual bool handleMessage(const Message& cmd);

plugins/channelrx/demodnfm/nfmdemod.h

@@ -65,7 +65,8 @@ public:
 	virtual ~NFMDemod();
 	virtual void destroy() { delete this; }
 
-	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positive);
+    using BasebandSampleSink::feed;
+    virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();
 	virtual bool handleMessage(const Message& cmd);

plugins/channelrx/demodssb/ssbdemod.h

@@ -68,7 +68,8 @@ public:
 	virtual void destroy() { delete this; }
     SpectrumVis *getSpectrumVis() { return &m_spectrumVis; }
 
-	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
+    using BasebandSampleSink::feed;
+    virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();
 	virtual bool handleMessage(const Message& cmd);

plugins/channelrx/demodwfm/wfmdemod.h

@@ -64,6 +64,7 @@ public:
 	virtual ~WFMDemod();
 	virtual void destroy() { delete this; }
 
+    using BasebandSampleSink::feed;
 	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();

plugins/channelrx/filesink/filesink.h

@@ -66,6 +66,7 @@ public:
     virtual ~FileSink();
     virtual void destroy() { delete this; }
 
+    using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
     virtual void start();
     virtual void stop();

plugins/channelrx/freqtracker/freqtracker.h

@@ -64,6 +64,7 @@ public:
 	virtual ~FreqTracker();
 	virtual void destroy() { delete this; }
 
+    using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();

plugins/channelrx/localsink/localsink.h

@@ -86,6 +86,7 @@ public:
     virtual ~LocalSink();
     virtual void destroy() { delete this; }
 
+    using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
     virtual void start();
     virtual void stop();

plugins/channelrx/remotesink/remotesink.h

@@ -65,6 +65,7 @@ public:
     virtual ~RemoteSink();
     virtual void destroy() { delete this; }
 
+    using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
     virtual void start();
     virtual void stop();

plugins/channelrx/sigmffilesink/sigmffilesink.h

@@ -66,6 +66,7 @@ public:
     virtual ~SigMFFileSink();
     virtual void destroy() { delete this; }
 
+    using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
     virtual void start();
     virtual void stop();

plugins/channelrx/udpsink/udpsink.h

@@ -72,7 +72,8 @@ public:
 	double getInMagSq() const { return m_basebandSink->getInMagSq(); }
 	bool getSquelchOpen() const { return m_basebandSink->getSquelchOpen(); }
 
-	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
+    using BasebandSampleSink::feed;
+    virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool po);
 	virtual void start();
 	virtual void stop();
 	virtual bool handleMessage(const Message& cmd);

sdrbase/dsp/filerecordinterface.cpp

@@ -21,9 +21,10 @@
 
 #include "filerecordinterface.h"
 
-FileRecordInterface::FileRecordInterface() :
+FileRecordInterface::FileRecordInterface()
-    BasebandSampleSink()
+{
-{}
+    connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
+}
 
 FileRecordInterface::~FileRecordInterface()
 {}
@@ -72,3 +73,16 @@ FileRecordInterface::RecordType FileRecordInterface::guessTypeFromFileName(const
         return RecordTypeUndefined;
     }
 }
+
+void FileRecordInterface::handleInputMessages()
+{
+	Message* message;
+
+	while ((message = m_inputMessageQueue.pop()) != 0)
+	{
+		if (handleMessage(*message))
+		{
+			delete message;
+		}
+	}
+}

sdrbase/dsp/filerecordinterface.h

@@ -21,11 +21,15 @@
 #define INCLUDE_FILERECORD_INTERFACE_H
 
 #include <QString>
+#include <QObject>
 
-#include "dsp/basebandsamplesink.h"
+#include "dsp/dsptypes.h"
+#include "util/message.h"
+#include "util/messagequeue.h"
 #include "export.h"
 
-class SDRBASE_API FileRecordInterface : public BasebandSampleSink {
+class SDRBASE_API FileRecordInterface : public QObject {
+    Q_OBJECT
 public:
     enum RecordType
     {
@@ -42,6 +46,10 @@ public:
 	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly) = 0;
 	virtual bool handleMessage(const Message& cmd) = 0; //!< Processing of a message. Returns true if message has actually been processed
 
+	MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } //!< Get the queue for asynchronous inbound communication
+    virtual void setMessageQueueToGUI(MessageQueue *queue) { m_guiMessageQueue = queue; }
+    MessageQueue *getMessageQueueToGUI() { return m_guiMessageQueue; }
+
     virtual void setFileName(const QString &filename) = 0;
     virtual void startRecording() = 0;
     virtual void stopRecording() = 0;
@@ -49,6 +57,14 @@ public:
 
     static QString genUniqueFileName(unsigned int deviceUID, int istream = -1);
     static RecordType guessTypeFromFileName(const QString& fileName, QString& fileBase);
+
+protected:
+	MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
+    MessageQueue *m_guiMessageQueue;  //!< Input message queue to the GUI
+
+protected slots:
+	void handleInputMessages();
+
 };
 
 

sdrgui/dsp/scopevis.h

@@ -239,6 +239,7 @@ public:
     const std::vector<TraceData>& getTracesData() const { return m_traces.m_tracesData; }
     uint32_t getNbTriggers() const { return m_triggerConditions.size(); }
 
+    using BasebandSampleSink::feed;
     virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
     virtual void start();
     virtual void stop();

sdrgui/dsp/scopevisxy.h

@@ -34,6 +34,7 @@ public:
 	ScopeVisXY(TVScreen *tvScreen);
 	virtual ~ScopeVisXY();
 
+	using BasebandSampleSink::feed;
 	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
 	virtual void start();
 	virtual void stop();

sdrgui/dsp/spectrumscopecombovis.h

@@ -14,6 +14,7 @@ public:
     SpectrumScopeComboVis(SpectrumVis* spectrumVis, ScopeVis* scopeVis);
 	virtual ~SpectrumScopeComboVis();
 
+	using BasebandSampleSink::feed;
 	virtual void feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly);
 	virtual void start();
 	virtual void stop();