From 0b4ee5cfccfdda64a8c40bffabaefa433cfa21db Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 4 Sep 2017 11:07:59 +0200 Subject: [PATCH] GUI segregation: Removed FileRecord reference in sample sink plugin GUIs --- plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp | 6 ------ plugins/samplesink/bladerfoutput/bladerfoutputgui.h | 2 -- plugins/samplesink/limesdroutput/limesdroutputgui.cpp | 4 ---- plugins/samplesink/limesdroutput/limesdroutputgui.h | 2 -- 4 files changed, 14 deletions(-) diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp index e4c188c90..9af44a893 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp +++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.cpp @@ -25,7 +25,6 @@ #include "dsp/dspengine.h" #include "dsp/dspcommands.h" #include "device/devicesinkapi.h" -#include "dsp/filerecord.h" #include "bladerfoutputgui.h" #include "bladerf/devicebladerfvalues.h" @@ -63,16 +62,12 @@ BladerfOutputGui::BladerfOutputGui(DeviceSinkAPI *deviceAPI, QWidget* parent) : char recFileNameCStr[30]; sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); - m_fileSink = new FileRecord(std::string(recFileNameCStr)); -// m_deviceAPI->addSink(m_fileSink); connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleDSPMessages()), Qt::QueuedConnection); } BladerfOutputGui::~BladerfOutputGui() { -// m_deviceAPI->removeSink(m_fileSink); - delete m_fileSink; delete m_deviceSampleSink; // Valgrind memcheck delete ui; } @@ -156,7 +151,6 @@ void BladerfOutputGui::handleDSPMessages() m_deviceCenterFrequency = notif->getCenterFrequency(); qDebug("BladerfOutputGui::handleDSPMessages: SampleRate:%d, CenterFrequency:%llu", notif->getSampleRate(), notif->getCenterFrequency()); updateSampleRateAndFrequency(); - m_fileSink->handleMessage(*notif); // forward to file sink delete message; } diff --git a/plugins/samplesink/bladerfoutput/bladerfoutputgui.h b/plugins/samplesink/bladerfoutput/bladerfoutputgui.h index 1e8039da4..fa64adc04 100644 --- a/plugins/samplesink/bladerfoutput/bladerfoutputgui.h +++ b/plugins/samplesink/bladerfoutput/bladerfoutputgui.h @@ -25,7 +25,6 @@ class DeviceSinkAPI; class DeviceSampleSink; -class FileRecord; namespace Ui { class BladerfOutputGui; @@ -57,7 +56,6 @@ private: QTimer m_updateTimer; QTimer m_statusTimer; DeviceSampleSink* m_deviceSampleSink; - FileRecord *m_fileSink; //!< File sink to record device I/Q output TODO: change to file input int m_sampleRate; quint64 m_deviceCenterFrequency; //!< Center frequency in device int m_lastEngineState; diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp index 5e11c16e6..a2f39f788 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.cpp +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.cpp @@ -23,7 +23,6 @@ #include "dsp/dspengine.h" #include "dsp/dspcommands.h" #include "device/devicesinkapi.h" -#include "dsp/filerecord.h" #include "limesdroutputgui.h" LimeSDROutputGUI::LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, QWidget* parent) : @@ -76,14 +75,12 @@ LimeSDROutputGUI::LimeSDROutputGUI(DeviceSinkAPI *deviceAPI, QWidget* parent) : char recFileNameCStr[30]; sprintf(recFileNameCStr, "test_%d.sdriq", m_deviceAPI->getDeviceUID()); - m_fileSink = new FileRecord(std::string(recFileNameCStr)); connect(m_deviceAPI->getDeviceOutputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleMessagesToGUI()), Qt::QueuedConnection); } LimeSDROutputGUI::~LimeSDROutputGUI() { - delete m_fileSink; delete m_sampleSink; // Valgrind memcheck delete ui; } @@ -161,7 +158,6 @@ void LimeSDROutputGUI::handleMessagesToGUI() m_deviceCenterFrequency = notif->getCenterFrequency(); qDebug("LimeSDROutputGUI::handleMessagesToGUI: SampleRate: %d, CenterFrequency: %llu", notif->getSampleRate(), notif->getCenterFrequency()); updateSampleRateAndFrequency(); - m_fileSink->handleMessage(*notif); // forward to file sink delete message; } diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.h b/plugins/samplesink/limesdroutput/limesdroutputgui.h index bc78a53b1..0d46f15b9 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.h +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.h @@ -25,7 +25,6 @@ class DeviceSinkAPI; class DeviceSampleSink; -class FileRecord; namespace Ui { class LimeSDROutputGUI; @@ -58,7 +57,6 @@ private: QTimer m_updateTimer; QTimer m_statusTimer; DeviceSampleSink* m_sampleSink; - FileRecord *m_fileSink; //!< File sink to record device I/Q output TODO: change to file input int m_sampleRate; quint64 m_deviceCenterFrequency; //!< Center frequency in device int m_lastEngineState;