From f92622b45adc8b6bd3036260edf1f5124ea5cb50 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 30 Sep 2020 15:22:08 +0200 Subject: [PATCH] Remove unused message from BasebandSampleSink --- plugins/channelrx/localsink/localsink.h | 2 ++ sdrbase/dsp/basebandsamplesink.cpp | 21 +++++++++++++++++++-- sdrbase/dsp/basebandsamplesink.h | 22 ---------------------- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/plugins/channelrx/localsink/localsink.h b/plugins/channelrx/localsink/localsink.h index d0431aab2..b75c44e7a 100644 --- a/plugins/channelrx/localsink/localsink.h +++ b/plugins/channelrx/localsink/localsink.h @@ -24,6 +24,8 @@ #include "dsp/basebandsamplesink.h" #include "channel/channelapi.h" +#include "util/message.h" + #include "localsinksettings.h" class QNetworkAccessManager; diff --git a/sdrbase/dsp/basebandsamplesink.cpp b/sdrbase/dsp/basebandsamplesink.cpp index 81c9f53a9..faa5ca718 100644 --- a/sdrbase/dsp/basebandsamplesink.cpp +++ b/sdrbase/dsp/basebandsamplesink.cpp @@ -1,6 +1,23 @@ -#include "basebandsamplesink.h" +/////////////////////////////////////////////////////////////////////////////////// +// Copyright (C) 2016 F4EXB // +// written by Edouard Griffiths // +// // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation as version 3 of the License, or // +// (at your option) any later version. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License V3 for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program. If not, see . // +/////////////////////////////////////////////////////////////////////////////////// +#include "util/message.h" -MESSAGE_CLASS_DEFINITION(BasebandSampleSink::MsgThreadedSink, Message) +#include "basebandsamplesink.h" BasebandSampleSink::BasebandSampleSink() : m_guiMessageQueue(0) diff --git a/sdrbase/dsp/basebandsamplesink.h b/sdrbase/dsp/basebandsamplesink.h index 4af29a591..de9649329 100644 --- a/sdrbase/dsp/basebandsamplesink.h +++ b/sdrbase/dsp/basebandsamplesink.h @@ -23,34 +23,12 @@ #include "dsp/dsptypes.h" #include "export.h" #include "util/messagequeue.h" -#include "util/message.h" class Message; class SDRBASE_API BasebandSampleSink : public QObject { Q_OBJECT public: - /** Used to notify on which thread the sample sink is now running (with ThreadedSampleSink) */ - class SDRBASE_API MsgThreadedSink : public Message { - MESSAGE_CLASS_DECLARATION - - public: - const QThread* getThread() const { return m_thread; } - - static MsgThreadedSink* create(const QThread* thread) - { - return new MsgThreadedSink(thread); - } - - private: - const QThread *m_thread; - - MsgThreadedSink(const QThread *thread) : - Message(), - m_thread(thread) - { } - }; - BasebandSampleSink(); virtual ~BasebandSampleSink();