From 0eab0fdb20a77dd402ed81f5e7b0f2fc846449ca Mon Sep 17 00:00:00 2001 From: f4exb Date: Sat, 14 Oct 2017 07:34:00 +0200 Subject: [PATCH] DeviceSampleSink: removed output queue to GUI --- plugins/samplesink/filesink/filesinkoutput.cpp | 6 +++--- plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp | 2 +- sdrbase/dsp/devicesamplesink.h | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/plugins/samplesink/filesink/filesinkoutput.cpp b/plugins/samplesink/filesink/filesinkoutput.cpp index 85630c132..939e57516 100644 --- a/plugins/samplesink/filesink/filesinkoutput.cpp +++ b/plugins/samplesink/filesink/filesinkoutput.cpp @@ -99,7 +99,7 @@ bool FileSinkOutput::start() qDebug("FileSinkOutput::start: started"); MsgReportFileSinkGeneration *report = MsgReportFileSinkGeneration::create(true); // acquisition on - getOutputMessageQueueToGUI()->push(report); + getMessageQueueToGUI()->push(report); return true; } @@ -121,7 +121,7 @@ void FileSinkOutput::stop() } MsgReportFileSinkGeneration *report = MsgReportFileSinkGeneration::create(false); // acquisition off - getOutputMessageQueueToGUI()->push(report); + getMessageQueueToGUI()->push(report); } const QString& FileSinkOutput::getDeviceDescription() const @@ -186,7 +186,7 @@ bool FileSinkOutput::handleMessage(const Message& message) if (m_fileSinkThread != 0) { report = MsgReportFileSinkStreamTiming::create(m_fileSinkThread->getSamplesCount()); - getOutputMessageQueueToGUI()->push(report); + getMessageQueueToGUI()->push(report); } return true; diff --git a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp index ac61c8979..adc3ad8d6 100644 --- a/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp +++ b/plugins/samplesink/sdrdaemonsink/sdrdaemonsinkoutput.cpp @@ -152,7 +152,7 @@ bool SDRdaemonSinkOutput::handleMessage(const Message& message) if (m_sdrDaemonSinkThread != 0) { report = MsgReportSDRdaemonSinkStreamTiming::create(m_sdrDaemonSinkThread->getSamplesCount()); - getOutputMessageQueueToGUI()->push(report); + getMessageQueueToGUI()->push(report); } return true; diff --git a/sdrbase/dsp/devicesamplesink.h b/sdrbase/dsp/devicesamplesink.h index daea864c2..a32262ba8 100644 --- a/sdrbase/dsp/devicesamplesink.h +++ b/sdrbase/dsp/devicesamplesink.h @@ -44,7 +44,6 @@ public: MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; } void setMessageQueueToGUI(MessageQueue *queue) { m_guiMessageQueue = queue; } MessageQueue *getMessageQueueToGUI() { return m_guiMessageQueue; } - MessageQueue *getOutputMessageQueueToGUI() { return &m_outputMessageQueueToGUI; } // TODO: remove SampleSourceFifo* getSampleFifo() { return &m_sampleSourceFifo; } protected slots: @@ -54,7 +53,6 @@ protected: SampleSourceFifo m_sampleSourceFifo; MessageQueue m_inputMessageQueue; //!< Input queue to the sink MessageQueue *m_guiMessageQueue; //!< Input message queue to the GUI - MessageQueue m_outputMessageQueueToGUI; //!< Output queue specialized for the sink GUI // TODO: remove }; #endif /* SDRBASE_DSP_DEVICESAMPLESINK_H_ */